No more ecs

client/network.ts

@@ -2,14 +2,6 @@ import { BlockChange, ClientMessage, PlayerInfo, ServerMessage } from "$/common/
 import type { ModListing } from "$/common/mod_loader.ts";
 import type { Join, ServerSocket, Welcome } from "./handshake.ts";
 
-export interface RemotePlayer extends PlayerInfo {
-	// where we draw them, eased towards x/y/z so movement isnt choppy
-	display_x: number;
-	display_y: number;
-	display_z: number;
-	color: [number, number, number];
-}
-
 export class Connection {
 	#server: ServerSocket;
 	id: string;
@@ -19,7 +11,8 @@ export class Connection {
 	initial_changes: BlockChange[];
 	spawn: { x: number; y: number; z: number; yaw: number; pitch: number };
 	selected_slot: number;
-	players = new Map<string, RemotePlayer>();
+	// who was already there when we joined, they become entities in the level
+	initial_players: PlayerInfo[];
 
 	constructor(server: ServerSocket, welcome: Welcome, join: Join) {
 		this.#server = server;
@@ -30,12 +23,10 @@ export class Connection {
 		this.initial_changes = join.changes;
 		this.spawn = join.spawn;
 		this.selected_slot = join.selected_slot;
-		for (const player of join.players) {
-			this.add_player(player);
-		}
+		this.initial_players = join.players;
 	}
 
-	// handled by the network system inside the game loop, not whenever the socket feels like it
+	// handled by the packet listener inside the game loop, not whenever the socket feels like it
 	get incoming(): ServerMessage[] {
 		return this.#server.messages;
 	}
@@ -47,40 +38,6 @@ export class Connection {
 	send(message: ClientMessage) {
 		this.#server.send(message);
 	}
-
-	add_player(player: PlayerInfo) {
-		this.players.set(player.id, {
-			...player,
-			display_x: player.x,
-			display_y: player.y,
-			display_z: player.z,
-			color: color_from_name(player.name),
-		});
-	}
-}
-
-function color_from_name(name: string): [number, number, number] {
-	let hash = 0;
-	for (const ch of name) {
-		hash = (hash * 31 + ch.charCodeAt(0)) | 0;
-	}
-	const hue = ((hash % 360) + 360) % 360;
-	// hsl with s=0.6 l=0.6 to rgb
-	const c = 0.48;
-	const x = c * (1 - Math.abs(((hue / 60) % 2) - 1));
-	const m = 0.36;
-	const [r, g, b] = hue < 60
-		? [c, x, 0]
-		: hue < 120
-		? [x, c, 0]
-		: hue < 180
-		? [0, c, x]
-		: hue < 240
-		? [0, x, c]
-		: hue < 300
-		? [x, 0, c]
-		: [c, 0, x];
-	return [r + m, g + m, b + m];
 }
 
 export function get_player_name(): string {