feat: combine core client server into 1 file

src/App.tsx

@@ -2,7 +2,7 @@ import React, {useEffect} from 'react';
 import './App.css';
 import {Game} from './Game';
 import {CasualWorldClient} from './game/world/Casual/CasualWorld.client';
-import {CasualWorldCore} from './game/world/Casual/CasualWorld.core';
+import {CasualWorldCore} from './game/world/CasualWorld.core';
 import {BirdClient, BirdCore} from './game';
 import {CasualPlayerClient} from './game/player';
 

src/game/entity/Bird/Bird.client.ts → src/game/entity/Bird.ts

@@ -1,8 +1,22 @@
 import * as PIXI from 'pixi.js';
-import {EntityClient} from '../Entity/Entity.client';
-import {type BirdCore} from './Bird.core';
+import {Circle} from 'detect-collisions';
+import {EntityCore} from './Entity';
 import {type TickData} from '@/types/TickData';
 
+export class BirdCore extends EntityCore {
+	body = new Circle({x: 200, y: 0}, 10);
+	mass = (40 / 40) * 0.8;
+
+	nextTick(_tickData: TickData): void {
+		console.log(_tickData);
+		this.velocity.y += this.mass;
+	}
+
+	fly() {
+		this.velocity.y = -10;
+	}
+}
+
 export class BirdClient extends EntityClient {
 	displayObject = PIXI.Sprite.from('public/bird.png');
 	declare entityCore: BirdCore;
@@ -17,3 +31,9 @@ export class BirdClient extends EntityClient {
 		this.displayObject.y = this.entityCore.body.pos.y;
 	}
 }
+
+export class BirdServer extends EntityServer {
+	constructor() {
+		console.log('BirdCore');
+	}
+}

src/game/entity/Entity/Entity.core.ts → src/game/entity/Entity.ts

@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/no-empty-function */
+import type * as PIXI from 'pixi.js';
 import {type TickData} from '@/types/TickData';
 import {AsyncEE} from '@/util/AsyncEE';
 import {type Response, type Body, SATVector} from 'detect-collisions';
@@ -41,3 +41,31 @@ export type EntityEventMap = {
 	'collision-stay': (entity: EntityCore) => void;
 	'collision-exit': (entity: EntityCore) => void;
 };
+
+export abstract class EntityClient {
+	abstract displayObject: PIXI.DisplayObject;
+
+	constructor(public world: WorldClient, public entityCore: EntityCore) {
+	}
+
+	init(entityCore: EntityCore) {
+		console.log(this.displayObject);
+		this.displayObject.x = entityCore.body.pos.x;
+		this.displayObject.y = entityCore.body.pos.y;
+	}
+
+	initServer(_entityServer: EntityServer) {}
+
+	nextTick(tickData: TickData) {
+		this.entityCore.nextTick(tickData);
+	}
+}
+
+export abstract class EntityServer {
+	constructor() {
+		console.log('BirdCore');
+	}
+
+	nextTick() {
+	}
+}

src/game/entity/index.ts

@@ -1,7 +1,7 @@
-export * from './Entity/Entity.core';
+export * from './Entity';
 export * from './Entity/Entity.client';
 export * from './Entity/Entity.server';
 
-export * from './Bird/Bird.core';
+export * from './Bird';
 export * from './Bird/Bird.client';
 export * from './Bird/Bird.server';

src/game/player/CasualPlayer.ts

@@ -0,0 +1,18 @@
+import {type TickData} from '@/types/TickData';
+import {PlayerCore} from './Player';
+
+export class CasualPlayerCore extends PlayerCore {
+	nextTick(_tickData: TickData): void {
+
+	}
+}
+
+export class CasualPlayerClient extends PlayerClient {
+	nextTick(_tickData: TickData): void {
+
+	}
+}
+
+export class CasualPlayerServer extends PlayerServer {
+
+}

src/game/player/Player/Player.core.ts → src/game/player/Player.ts

@@ -23,3 +23,26 @@ export abstract class PlayerCore {
 export type PlayerEventMap = {
 	ready: () => void;
 };
+
+export abstract class PlayerClient {
+	displayObject?: PIXI.DisplayObject;
+
+	get isReady() {
+		return this.playerCore?.isReady;
+	}
+
+	constructor(public playerCore: PlayerCore = new CasualPlayerCore()) {
+	}
+
+	playAs(entityClient: EntityClient) {
+		this.playerCore.playAs(entityClient.entityCore);
+	}
+
+	nextTick(tickData: TickData) {
+		this.playerCore.nextTick(tickData);
+	}
+}
+
+export class PlayerServer {
+
+}

src/game/player/index.ts

@@ -1,7 +1,7 @@
-export * from './Player/Player.core';
+export * from './Player';
 export * from './Player/Player.client';
 export * from './Player/Player.server';
 
-export * from './Casual/CasualPlayer.core';
+export * from './CasualPlayer';
 export * from './Casual/CasualPlayer.client';
 export * from './Casual/CasualPlayer.server';

src/game/world/CasualWorld.ts

@@ -0,0 +1,9 @@
+import {WorldCore} from './World';
+
+export class CasualWorldCore extends WorldCore {
+
+}
+
+export class CasualWorldClient extends WorldClient {
+
+}

src/game/world/World/World.core.ts → src/game/world/World.ts

@@ -109,3 +109,61 @@ type ResponseBodyRefEntity = Omit<Response, 'a' | 'b'> & {
 function genId(e1: EntityCore, e2: EntityCore) {
 	return e1.id + e2.id;
 }
+
+const EntityClientClassifiers = {
+	BirdClient,
+};
+
+export abstract class WorldClient {
+	app = new PIXI.Application({
+		width: window.innerWidth,
+		height: window.innerHeight,
+		backgroundColor: '#133a2b',
+		antialias: true,
+		resizeTo: window,
+	});
+
+	entities = new Map<string, EntityClient>();
+
+	constructor(public worldCore: WorldCore) {
+		worldCore.ee.on('+entities', (entityCore: EntityCore) => {
+			const EntityClientClassifier = EntityClientClassifiers[entityCore.constructor.name as keyof typeof EntityClientClassifiers];
+			if (!EntityClientClassifier) {
+				throw new Error(`EntityClientClassifier not found for ${entityCore.constructor.name}`);
+			}
+
+			const entityClient = new EntityClientClassifier(this, entityCore);
+			this.entities.set(entityCore.id, entityClient);
+			this.app.stage.addChild(entityClient.displayObject);
+
+			// Const entityServer = this.room.state.entities.get(entityCore.id);
+			// if (entityServer) {
+			// 	entityClient.initServer(entityServer);
+			// } else {
+			// 	// Previous object that have been removed from the server but still exists on worldCore.events(api:entities add) to be re-add
+			// }
+
+			// if (entityCore.id === this.room.sessionId) {
+			// 	this.playAs(entityCore);
+			// }
+		});
+
+		worldCore.ee.on('-entities', (entityCore: EntityCore) => {
+			const entity = this.entities.get(entityCore.id);
+			if (entity) {
+				this.app.stage.removeChild(entity.displayObject);
+				this.entities.delete(entityCore.id);
+			}
+		});
+	}
+
+	nextTick(tickData: TickData) {
+		this.entities.forEach(entity => {
+			entity.nextTick(tickData);
+		});
+		this.worldCore.nextTick(tickData);
+	}
+}
+
+export abstract class WorldServer {
+}