hytopia 0.2.11 → 0.3.0-dev.3

package/examples/ai-agents/index.ts

@@ -26,10 +26,10 @@
 import {
 	startServer,
 	Audio,
-	GameServer,
-	PlayerEntity,
-	World,
+	ChatEvent,
 	Player,
+	PlayerEntity,
+	PlayerEvent,
 	Vector3,
 } from "hytopia";
 
@@ -93,7 +93,7 @@ startServer((world) => {
 	 * their inputs to control their in-game entity and
 	 * internally uses our player entity controller.
 	 */
-	world.onPlayerJoin = (player) => {
+	world.on(PlayerEvent.JOINED_WORLD, ({ player }) => {
 		const playerEntity = new PlayerEntity({
 			player,
 			name: "Player",
@@ -126,7 +126,7 @@ startServer((world) => {
 				lastThought: agent.getLastMonologue() || "Idle",
 			})),
 		});
-	};
+	});
 
 	/**
 	 * Handle player leaving the game. The onPlayerLeave
@@ -139,11 +139,11 @@ startServer((world) => {
 	 * the player who left by using our world's EntityManager
 	 * instance.
 	 */
-	world.onPlayerLeave = (player) => {
+	world.on(PlayerEvent.LEFT_WORLD, ({ player }) => {
 		world.entityManager
 			.getPlayerEntitiesByPlayer(player)
 			.forEach((entity) => entity.despawn());
-	};
+	});
 
 	/**
 	 * Play some peaceful ambient music to
@@ -289,11 +289,7 @@ startServer((world) => {
 	 * Instead of a chat command, we can override the chat message broadcast
 	 * to automatically respond to the player.
 	 */
-	world.chatManager.onBroadcastMessage = (
-		player: Player | undefined,
-		message: string,
-		color?: string
-	) => {
+	world.chatManager.on(ChatEvent.BROADCAST_MESSAGE, ({ player, message }) => {
 		const agents = world.entityManager
 			.getAllEntities()
 			.filter((entity) => entity instanceof BaseAgent) as BaseAgent[];
@@ -346,5 +342,5 @@ startServer((world) => {
 				});
 			}
 		});
-	};
+	});
 });

package/examples/ai-agents/src/BaseAgent.ts

@@ -3,6 +3,7 @@
  */
 import {
 	Entity,
+	EntityEvent,
 	Player,
 	Vector3,
 	World,
@@ -79,7 +80,7 @@ export class BaseAgent extends Entity {
 		super({
 			name: options.name || "BaseAgent",
 			modelUri: "models/players/player.gltf",
-			modelLoopedAnimations: ["idle"],
+			modelLoopedAnimations: ["idle_upper", "idle_lower"],
 			modelScale: 0.5,
 			controller: new SimpleEntityController(),
 			rigidBodyOptions: {
@@ -88,7 +89,8 @@ export class BaseAgent extends Entity {
 			},
 		});
 
-		this.onTick = this.onTickBehavior;
+		this.on(EntityEvent.TICK, this.onTickBehavior);
+
 		this.systemPrompt = options.systemPrompt;
 		this.openai = new OpenAI({
 			apiKey: process.env.OPENAI_API_KEY,

package/examples/ai-agents/src/behaviors/FishingBehavior.ts

@@ -89,8 +89,8 @@ export class FishingBehavior implements AgentBehavior {
 			this.isFishing = true;
 
 			// Start fishing animation if available
-			agent.stopModelAnimations(["walk", "run"]);
-			agent.startModelLoopedAnimations(["idle"]); // Could be replaced with a fishing animation
+			agent.stopModelAnimations(["walk_upper", "walk_lower", "run_upper", "run_lower"]);
+			agent.startModelLoopedAnimations(["idle_upper", "idle_lower"]); // Could be replaced with a fishing animation
 
 			// Simulate fishing time
 			setTimeout(() => {

package/examples/ai-agents/src/behaviors/FollowBehavior.ts

@@ -80,7 +80,7 @@ export class FollowBehavior implements AgentBehavior {
 
 		if (Math.abs(distance - this.followDistance) > 0.5) {
 			const isRunning = distance > this.runThreshold;
-			agent.startModelLoopedAnimations([isRunning ? "run" : "walk"]);
+			agent.startModelLoopedAnimations([isRunning ? "run_upper" : "walk_upper", isRunning ? "run_lower" : "walk_lower"]);
 
 			const angle = Math.atan2(dz, dx);
 			const targetPos = new Vector3(
@@ -115,8 +115,8 @@ export class FollowBehavior implements AgentBehavior {
 			);
 			agent.controller.face(targetEntity.position, this.speed * 2);
 		} else {
-			agent.stopModelAnimations(["walk", "run"]);
-			agent.startModelLoopedAnimations(["idle"]);
+			agent.stopModelAnimations(["walk_upper", "walk_lower", "run_upper", "run_lower"]);
+			agent.startModelLoopedAnimations(["idle_upper", "idle_lower"]);
 			this.isJumping = false; // Reset jump state when we're close enough
 		}
 	}

package/examples/ai-agents/src/behaviors/MiningBehavior.ts

@@ -107,8 +107,8 @@ export class MiningBehavior implements AgentBehavior {
 			this.isMining = true;
 
 			// Start mining animation if available
-			agent.stopModelAnimations(["walk", "run"]);
-			agent.startModelLoopedAnimations(["idle"]); // Could be replaced with mining animation
+			agent.stopModelAnimations(["walk_upper", "walk_lower", "run_upper", "run_lower"]);
+			agent.startModelLoopedAnimations(["idle_upper", "idle_lower"]); // Could be replaced with mining animation
 
 			// Simulate mining time
 			setTimeout(() => {

package/examples/ai-agents/src/behaviors/PathfindingBehavior.ts

@@ -48,8 +48,8 @@ export class PathfindingBehavior implements AgentBehavior {
 				).distance(finalPoint);
 
 				if (distanceToFinal < 3) {
-					agent.stopModelAnimations(["walk"]);
-					agent.startModelLoopedAnimations(["idle"]);
+					agent.stopModelAnimations(["walk_upper", "walk_lower"]);
+					agent.startModelLoopedAnimations(["idle_upper", "idle_lower"]);
 					if (this.targetEntity) {
 						agent.controller.face(
 							this.targetEntity.position,
@@ -75,8 +75,8 @@ export class PathfindingBehavior implements AgentBehavior {
 							this.targetEntity.position,
 							this.moveSpeed * 2
 						);
-						agent.stopModelAnimations(["walk"]);
-						agent.startModelLoopedAnimations(["idle"]);
+						agent.stopModelAnimations(["walk_upper", "walk_lower"]);
+						agent.startModelLoopedAnimations(["idle_upper", "idle_lower"]);
 
 						this.targetEntity = undefined;
 					}
@@ -111,15 +111,15 @@ export class PathfindingBehavior implements AgentBehavior {
 					moveIgnoreAxes: yDiff >= 0 ? { y: true } : undefined,
 				});
 				agent.controller.face(nextPoint, this.moveSpeed * 2);
-				agent.startModelLoopedAnimations(["walk"]);
+				agent.startModelLoopedAnimations(["walk_upper", "walk_lower"]);
 			}
 		} else if (this.path.length > 0) {
 			this.path = [];
 			this.currentPathIndex = 0;
 			this.isJumping = false;
 			this.jumpCooldown = 0;
-			agent.stopModelAnimations(["walk"]);
-			agent.startModelLoopedAnimations(["idle"]);
+			agent.stopModelAnimations(["walk_upper", "walk_lower"]);
+			agent.startModelLoopedAnimations(["idle_upper", "idle_lower"]);
 		}
 	}
 

package/examples/big-world/index.ts

@@ -1,6 +1,7 @@
 import {
   startServer,
   PlayerEntity,
+  PlayerEvent,
 } from 'hytopia';
 
 import worldMap from './assets/map.json';
@@ -22,7 +23,7 @@ startServer(world => {
   world.loadMap(worldMap);
 
   // Spawn a player entity when a player joins the game.
-  world.onPlayerJoin = player => {
+  world.on(PlayerEvent.JOINED_WORLD, ({ player }) => {
     const playerEntity = new PlayerEntity({
       player,
       name: 'Player',
@@ -32,10 +33,10 @@ startServer(world => {
     });
   
     playerEntity.spawn(world, { x: 0, y: 10, z: 0 });
-  };
+  });
 
   // Despawn all player entities when a player leaves the game.
-  world.onPlayerLeave = player => {
+  world.on(PlayerEvent.LEFT_WORLD, ({ player }) => {
     world.entityManager.getPlayerEntitiesByPlayer(player).forEach(entity => entity.despawn());
-  };
+  });
 });

package/examples/block-entity/index.ts

@@ -2,7 +2,9 @@ import {
   startServer,
   ColliderShape,
   PlayerEntity,
+  PlayerEvent,
   Entity,
+  EntityEvent,
   RigidBodyType,
   GameServer,
   SimpleEntityController,
@@ -17,7 +19,7 @@ startServer(world => {
   // world.simulation.enableDebugRendering(true);
   
   world.loadMap(worldMap);
-  world.onPlayerJoin = player => {
+  world.on(PlayerEvent.JOINED_WORLD, ({ player }) => {
     const playerEntity = new PlayerEntity({
       player,
       name: 'Player',
@@ -27,11 +29,11 @@ startServer(world => {
     });
   
     playerEntity.spawn(world, { x: 0, y: 10, z: 0 });
-  };
+  });
 
-  world.onPlayerLeave = player => {
+  world.on(PlayerEvent.LEFT_WORLD, ({ player }) => {
     world.entityManager.getPlayerEntitiesByPlayer(player).forEach(entity => entity.despawn());
-  };
+  });
 
   /**
    * Spawn a block entity as a moving platform
@@ -46,7 +48,7 @@ startServer(world => {
   });
 
   // Clamp the z range the platform moves back and forth between
-  blockPlatform.onTick = blockPlatform => { 
+  blockPlatform.on(EntityEvent.TICK, () => { 
     const position = blockPlatform.position;
 
     if (position.z < -9) {
@@ -56,7 +58,7 @@ startServer(world => {
     if (position.z > 8) {
       blockPlatform.setLinearVelocity({ x: 0, y: 0, z: -3 });
     }
-  };
+  });
 
   blockPlatform.spawn(world, { x: 3, y: 3, z: -7 });
 
@@ -87,11 +89,11 @@ startServer(world => {
     blockHalfExtents: { x: 0.5, y: 0.5, z: 0.5 }, 
   });
 
-  movableBlock.onEntityCollision = (movableBlock, otherEntity, started) => {
+  movableBlock.on(EntityEvent.ENTITY_COLLISION, ({ started }) => {
     if (started) {
       world.chatManager.sendBroadcastMessage('The sand block was pushed!');
     }
-  };
+  });
 
   movableBlock.spawn(world, { x: -4, y: 10, z: -6 });
 
@@ -149,7 +151,7 @@ startServer(world => {
 
   // Simple pathfinding
   let pathfindAccumulator = 0;
-  blockPet.onTick = (blockPet, tickDeltaMs) => {
+  blockPet.on(EntityEvent.TICK, ({ tickDeltaMs }) => {
     pathfindAccumulator += tickDeltaMs;
 
     if (pathfindAccumulator > 3000) { // only pathfind every 3 seconds so we don't do unecessary pathfinding
@@ -172,5 +174,5 @@ startServer(world => {
       blockPetEntityController.move(targetPosition, 3);
       blockPetEntityController.face(targetPosition, 1);
     }
-  };
+  });
 });

package/examples/child-entity/index.ts

@@ -2,6 +2,7 @@ import {
   startServer,
   Entity,
   PlayerEntity,
+  PlayerEvent,
   Quaternion,
 } from 'hytopia';
 
@@ -11,7 +12,7 @@ startServer(world => {
   world.loadMap(worldMap);
 
   // Spawn a player entity when a player joins the game.
-  world.onPlayerJoin = player => {
+  world.on(PlayerEvent.JOINED_WORLD, ({ player }) => {
     const playerEntity = new PlayerEntity({
       player,
       name: 'Player',
@@ -35,9 +36,9 @@ startServer(world => {
       { x: 0, y: 0.3, z: 0.5 }, // spawn with a position relative to the parent node
       Quaternion.fromEuler(-90, 0, 90), // spawn with a rotation so it looks correct in the hand
     );
-  };
+  });
 
-  world.onPlayerLeave = player => {
+  world.on(PlayerEvent.LEFT_WORLD, ({ player }) => {
     world.entityManager.getPlayerEntitiesByPlayer(player).forEach(entity => entity.despawn());
-  };
+  });
 });

package/examples/custom-ui/index.ts

@@ -3,7 +3,8 @@ import {
   Audio,
   Player,
   PlayerEntity,
-  PlayerUI,
+  PlayerEvent,
+  PlayerUIEvent,
 } from 'hytopia';
 
 import worldMap from './assets/map.json';
@@ -14,7 +15,7 @@ const playerEntityMap = new Map<Player, PlayerEntity>();
 startServer(world => {
   world.loadMap(worldMap);
 
-  world.onPlayerJoin = player => {
+  world.on(PlayerEvent.JOINED_WORLD, ({ player }) => {
     // Load the UI for the player.
     // This is loaded directly into a sandboxed iframe
     // overlaying the game. As long as it's an HTML file,
@@ -39,7 +40,8 @@ startServer(world => {
 
     // Handle data sent from player to server by client UI interactions we define. 
     // See the ui/index.html file for the UI code that sends the data.
-    player.ui.onData = (playerUI: PlayerUI, data: Record<string, any>) => {
+    player.ui.on(PlayerUIEvent.DATA, ({ playerUI, data }) => {
+      console.log('data', data);
       if (data.type === 'teleport') {
         const randomX = Math.random() * 40 - 20; // Random between -20 and 20
         const randomY = Math.random() * 13 + 2;  // Random between 2 and 15
@@ -47,14 +49,14 @@ startServer(world => {
 
         playerEntity.setPosition({ x: randomX, y: randomY, z: randomZ });
       }
-    };
-  };
+    });
+  });
 
-  world.onPlayerLeave = player => {
+  world.on(PlayerEvent.LEFT_WORLD, ({ player }) => {
     world.entityManager.getPlayerEntitiesByPlayer(player).forEach(entity => entity.despawn());
     // Remove the player entity from our map for our list.
     playerEntityMap.delete(player);
-  };
+  });
 
   // Update the player list every 1 second, no need to send too frequently.
   // We want to balance not sending too much UI data too frequently, because

package/examples/entity-controller/index.ts

@@ -1,6 +1,7 @@
 import {
   startServer,
   PlayerEntity,
+  PlayerEvent,
 } from 'hytopia';
 
 import MyEntityController from './MyEntityController';
@@ -17,7 +18,7 @@ startServer(world => {
 
   world.loadMap(worldMap);
 
-  world.onPlayerJoin = player => {
+  world.on(PlayerEvent.JOINED_WORLD, ({ player }) => {
     const playerEntity = new PlayerEntity({
       player,
       name: 'Player',
@@ -30,9 +31,9 @@ startServer(world => {
     playerEntity.spawn(world, { x: 0, y: 10, z: 0 });
     console.log('Spawned player entity!');
 
-  };
+  });
   
-  world.onPlayerLeave = player => {
+  world.on(PlayerEvent.LEFT_WORLD, ({ player }) => {
     world.entityManager.getPlayerEntitiesByPlayer(player).forEach(entity => entity.despawn());
-  };
+  });
 });

package/examples/entity-spawn/index.ts

@@ -2,7 +2,9 @@ import {
   startServer,
   ColliderShape,
   Entity,
+  EntityEvent,
   PlayerEntity,
+  PlayerEvent,
   RigidBodyType,
   World,
   Collider,
@@ -49,9 +51,9 @@ startServer(world => {
   });
 
   // A simple collision callback that logs when the spider collides with another Entity.
-  spider.onEntityCollision = (spider, otherEntity, started) => {
+  spider.on(EntityEvent.ENTITY_COLLISION, ({ otherEntity, started }) => {
     console.log('spider colliding with', otherEntity.name, started);
-  };
+  });
 
   spider.spawn(world, { x: 15, y: 10, z: 0 });
 });
@@ -66,7 +68,7 @@ function setup(world: World) {
   world.loadMap(worldMap);
 
   // Spawn a player entity when a player joins the game.
-  world.onPlayerJoin = player => {
+  world.on(PlayerEvent.JOINED_WORLD, ({ player }) => {
     const playerEntity = new PlayerEntity({
       player,
       name: 'Player',
@@ -76,10 +78,10 @@ function setup(world: World) {
     });
   
     playerEntity.spawn(world, { x: 0, y: 10, z: 0 });
-  };
+  });
 
   // Despawn all player entities when a player leaves the game.
-  world.onPlayerLeave = player => {
+  world.on(PlayerEvent.LEFT_WORLD, ({ player }) => {
     world.entityManager.getPlayerEntitiesByPlayer(player).forEach(entity => entity.despawn());
-  };
+  });
 }

package/examples/hole-in-wall-game/index.ts

@@ -4,11 +4,13 @@ import {
   Collider,
   ColliderShape,
   Entity,
+  EntityEvent,
   GameServer,
   RigidBodyType,
   startServer,
   Player,
   PlayerEntity,
+  PlayerEvent,
   SceneUI,
   World,
   CollisionGroup,
@@ -57,7 +59,7 @@ const GAME_PLAYER_ENTITIES = new Set<PlayerEntity>();
 let gameLevel = 1;
 let gameState: 'awaitingPlayers' | 'starting' | 'inProgress' = 'awaitingPlayers';
 let gameCountdownStartTime: number | null = null;
-let gameInterval: NodeJS.Timer;
+let gameInterval: NodeJS.Timeout;
 let gameStartTime: number | null = null;
 let gameUiState: object = {};
 
@@ -76,8 +78,8 @@ const gameInactiveAudio = new Audio({
 
 startServer(world => {
   world.loadMap(worldMap);
-  world.onPlayerJoin = player => onPlayerJoin(world, player);
-  world.onPlayerLeave = player => onPlayerLeave(world, player);
+  world.on(PlayerEvent.JOINED_WORLD, ({ player }) => onPlayerJoin(world, player));
+  world.on(PlayerEvent.LEFT_WORLD, ({ player }) => onPlayerLeave(world, player));
 
   spawnJoinNpc(world);
   gameInactiveAudio.play(world);
@@ -107,11 +109,11 @@ function onPlayerJoin(world: World, player: Player) {
     collidesWith: [CollisionGroup.BLOCK, GAME_CONFIG.WALL_COLLISION_GROUP],
   });
 
-  playerEntity.onTick = () => {
+  playerEntity.on(EntityEvent.TICK, () => {
     if (playerEntity.position.y < 5) {
       killPlayer(playerEntity);
     }
-  }
+  });
 }
 
 function onPlayerLeave(world: World, player: Player) {
@@ -343,7 +345,7 @@ function generateWall(world: World, direction: GameWallDirection, speedModifier:
         z: GAME_CONFIG.WALL_VELOCITIES[direction].z * speedModifier,
       });
 
-      wallSegment.onTick = () => {
+      wallSegment.on(EntityEvent.TICK, () => {
         if (!wallSegment.isSpawned) return;
         const position = wallSegment.position;
 
@@ -357,7 +359,7 @@ function generateWall(world: World, direction: GameWallDirection, speedModifier:
             }
           }, 1000);
         }
-      }
+      });
     }
   }
 }

package/examples/lighting/index.ts

@@ -4,6 +4,7 @@ import {
   Light,
   LightType,
   PlayerEntity,
+  PlayerEvent,
 } from 'hytopia';
 
 import worldMap from './assets/map.json';
@@ -83,7 +84,7 @@ startServer(world => {
   
 
   // Spawn a player entity when a player joins the game.
-  world.onPlayerJoin = player => {
+  world.on(PlayerEvent.JOINED_WORLD, ({ player }) => {
     const playerEntity = new PlayerEntity({
       player,
       name: 'Player',
@@ -105,12 +106,12 @@ startServer(world => {
       penumbra: 1,
       trackedEntity: playerEntity,
     })).spawn(world);
-  };
+  });
 
   // Despawn all player entities when a player leaves the game.
-  world.onPlayerLeave = player => {
+  world.on(PlayerEvent.LEFT_WORLD, ({ player }) => {
     world.entityManager.getPlayerEntitiesByPlayer(player).forEach(entity => entity.despawn());
-  };
+  });
 
   // Play some music on game start
   (new Audio({

package/examples/pathfinding/index.ts

@@ -3,6 +3,7 @@ import {
   Entity,
   PathfindingEntityController,
   PlayerEntity,
+  PlayerEvent,
   Quaternion,
   RigidBodyType,
   ColliderShape,
@@ -92,7 +93,7 @@ startServer(world => {
   });
 
   // Spawn a player entity when a player joins the game.
-  world.onPlayerJoin = player => {
+  world.on(PlayerEvent.JOINED_WORLD, ({ player }) => {
     const playerEntity = new PlayerEntity({
       player,
       name: 'Player',
@@ -104,10 +105,10 @@ startServer(world => {
     world.chatManager.sendPlayerMessage(player, 'To make the zombie pathfind to you, enter: /pathfind', '00FF00');
 
     playerEntity.spawn(world, { x: 4, y: 3, z: 1 });
-  };
+  });
 
   // Despawn all player entities when a player leaves the game.
-  world.onPlayerLeave = player => {
+  world.on(PlayerEvent.LEFT_WORLD, ({ player }) => {
     world.entityManager.getPlayerEntitiesByPlayer(player).forEach(entity => entity.despawn());
-  };
+  });
 });