consolidate packages (#79)

modules/core/main.ts

@@ -6,4 +6,53 @@ export * from "./src/ecs/Component";
 export * from "./src/net/rtc/RtcPeer";
 export * from "./src/net/rtc/RtcPool";
 export * from "./src/net/rtc/Compression";
-export * from "./src/game/Game";
+export * from "./src/Game";
+export * from "./src/contrib/components/Actions";
+export * from "./src/contrib/components/Actions";
+export * from "./src/contrib/components/actions/VehicleMovement";
+export * from "./src/contrib/components/actions/WASDMovement";
+export * from "./src/contrib/components/actions/ZombieMovement";
+export * from "./src/contrib/components/actions/util";
+export * from "./src/contrib/components/Controller";
+export * from "./src/contrib/components/Health";
+export * from "./src/contrib/components/Clickable";
+export * from "./src/contrib/components/Collider";
+export * from "./src/contrib/components/Debug";
+export * from "./src/contrib/components/Name";
+export * from "./src/contrib/components/Networked";
+export * from "./src/contrib/components/NPC";
+export * from "./src/contrib/components/Player";
+export * from "./src/contrib/components/Position";
+export * from "./src/contrib/components/relationships/Controlling";
+export * from "./src/contrib/components/Renderable";
+export * from "./src/contrib/components/renderables/Button";
+export * from "./src/contrib/components/renderables/Character";
+export * from "./src/contrib/components/renderables/DebugBounds";
+export * from "./src/contrib/components/renderables/HealthBar";
+export * from "./src/contrib/components/renderables/TextBox";
+export * from "./src/contrib/entities/Ball";
+export * from "./src/contrib/entities/Chat";
+export * from "./src/contrib/entities/Cursor";
+export * from "./src/contrib/entities/DebugButton";
+export * from "./src/contrib/entities/FpsText";
+export * from "./src/contrib/entities/FullscreenButton";
+export * from "./src/contrib/entities/Skelly";
+export * from "./src/contrib/entities/SpaceBackground";
+export * from "./src/contrib/entities/Spaceship";
+export * from "./src/contrib/entities/TileFloor";
+export * from "./src/contrib/entities/TilingSpriteFloor";
+export * from "./src/contrib/entities/Wall";
+export * from "./src/contrib/entities/Zombie";
+export * from "./src/contrib/systems/ClickableSystem";
+export * from "./src/contrib/systems/CommandSystem";
+export * from "./src/contrib/systems/DebugSystem";
+export * from "./src/contrib/systems/EnemySpawnSystem";
+export * from "./src/contrib/systems/GuiSystem";
+export * from "./src/contrib/systems/NPCSystem";
+export * from "./src/contrib/systems/InputSystem";
+export * from "./src/contrib/systems/PhysicsSystem";
+export * from "./src/contrib/systems/PlayerSpawnSystem";
+export * from "./src/contrib/systems/RenderSystem";
+export * from "./src/contrib/systems/RtcNetcodeSystem";
+export * from "./src/contrib/systems/WsNetcodeSystem";
+

modules/core/src/game/Game.ts → modules/core/src/Game.ts

@@ -1,5 +1,7 @@
 import { Renderer, Entity, System, RtcPool, SystemBuilder } from "@piggo-legends/core";
 
+const hz30 = 1000 / 30;
+
 export type GameProps = {
   net?: RtcPool,
   renderer?: Renderer,
@@ -33,7 +35,7 @@ export abstract class Game<T extends GameProps = GameProps> {
     if (this.runtimeMode === "client") {
       requestAnimationFrame(this.onTick);
     } else {
-      setInterval(this.onTick, 1000 / 30);
+      setInterval(this.onTick, hz30);
     }
   }
 
@@ -78,13 +80,13 @@ export abstract class Game<T extends GameProps = GameProps> {
   onTick = (time: DOMHighResTimeStamp) => {
 
     // skip if 1000 / 30 ms has not passed
-    if (this.runtimeMode === "client" && (time - this.lastTick) < (1000 / 30)) {
+    if (this.runtimeMode === "client" && (time - this.lastTick) < hz30) {
       if (requestAnimationFrame) requestAnimationFrame(this.onTick);
       return;
     }
 
     // update the last tick time
-    this.lastTick = this.lastTick + (1000 / 30);
+    this.lastTick = this.lastTick + hz30;
 
     // increment tick
     this.tick += 1;

modules/contrib/src/components/actions/VehicleMovement.ts → modules/core/src/contrib/components/actions/VehicleMovement.ts

@@ -1,5 +1,4 @@
-import { ActionMap, Position } from "@piggo-legends/contrib";
-import { Entity } from "@piggo-legends/core";
+import { Entity, ActionMap, Position } from "@piggo-legends/core";
 
 const TURN_SPEED = 0.1;
 const SLIDE_FACTOR = 1.5;

modules/contrib/src/components/actions/WASDMovement.ts → modules/core/src/contrib/components/actions/WASDMovement.ts

@@ -1,5 +1,4 @@
-import { ActionMap, AnimationKeys, Character, Position } from "@piggo-legends/contrib"
-import { Entity } from "@piggo-legends/core";
+import { ActionMap, AnimationKeys, Character, Entity, Position } from "@piggo-legends/core";
 
 const speed = 2.5;
 const speedDiagonal = speed / Math.sqrt(2);

modules/contrib/src/components/actions/ZombieMovement.ts → modules/core/src/contrib/components/actions/ZombieMovement.ts

@@ -1,5 +1,4 @@
-import { ActionMap, Character, Controlling, Position, Renderable } from "@piggo-legends/contrib";
-import { Entity, Game } from "@piggo-legends/core";
+import { ActionMap, Character, Entity, Game, Position, Renderable } from "@piggo-legends/core";
 
 const speed = 0.9;
 const t = (Math.PI * 2) / 16; // 16th of tau

modules/contrib/src/components/actions/util.ts → modules/core/src/contrib/components/actions/util.ts

@@ -1,5 +1,4 @@
-import { Action, Controlled, Controlling } from "@piggo-legends/contrib";
-import { Entity, Game, GameProps } from "@piggo-legends/core";
+import { Action, Controlled, Controlling, Entity, Game } from "@piggo-legends/core";
 
 export const playerControlsEntity: Action = (entity: Entity, game: Game, player: string) => {
   // check that the entity isn't already being controlled

modules/contrib/src/components/renderables/Button.ts → modules/core/src/contrib/components/renderables/Button.ts

@@ -1,5 +1,5 @@
 import { Graphics, Text } from "pixi.js";
-import { Renderable, RenderableProps } from "@piggo-legends/contrib";
+import { Renderable, RenderableProps } from "@piggo-legends/core";
 
 export type ButtonProps = RenderableProps & {
   dims: { w: number, textX: number, textY: number },

modules/contrib/src/components/renderables/Character.ts → modules/core/src/contrib/components/renderables/Character.ts

@@ -1,5 +1,5 @@
 import { AnimatedSprite, SCALE_MODES } from "pixi.js";
-import { Renderable, RenderableProps } from "@piggo-legends/contrib";
+import { Renderable, RenderableProps } from "@piggo-legends/core";
 
 export type CharacterProps = RenderableProps & {
   animations: {

modules/contrib/src/components/renderables/DebugBounds.ts → modules/core/src/contrib/components/renderables/DebugBounds.ts

@@ -1,5 +1,5 @@
 import { Graphics } from "pixi.js";
-import { Renderable, RenderableProps } from "@piggo-legends/contrib";
+import { Renderable, RenderableProps } from "@piggo-legends/core";
 
 export type DebugBoundsProps = RenderableProps & {
   debugRenderable: Renderable

modules/contrib/src/components/renderables/HealthBar.ts → modules/core/src/contrib/components/renderables/HealthBar.ts

@@ -1,4 +1,4 @@
-import { Health, Renderable, RenderableProps } from "@piggo-legends/contrib";
+import { Health, Renderable, RenderableProps } from "@piggo-legends/core";
 import { Graphics, Container } from "pixi.js";
 
 export type HealthBarProps = RenderableProps & {

modules/contrib/src/components/renderables/TextBox.ts → modules/core/src/contrib/components/renderables/TextBox.ts

@@ -1,5 +1,5 @@
 import { Text } from "pixi.js";
-import { Renderable, RenderableProps } from "@piggo-legends/contrib";
+import { Renderable, RenderableProps } from "@piggo-legends/core";
 
 export type TextBoxProps = RenderableProps & {
   text?: string

modules/contrib/src/entities/Ball.ts → modules/core/src/contrib/entities/Ball.ts

@@ -1,4 +1,4 @@
-import { Clickable, Collider, Debug, Networked, Position, Renderable } from "@piggo-legends/contrib";
+import { Clickable, Collider, Debug, Networked, Position, Renderable } from "@piggo-legends/core";
 import { Entity } from "@piggo-legends/core";
 import { Text } from "pixi.js";
 

modules/contrib/src/entities/Chat.ts → modules/core/src/contrib/entities/Chat.ts

@@ -1,5 +1,5 @@
 import { Entity } from "@piggo-legends/core";
-import { Position, Renderable, TextBox, chatBuffer, chatHistory, chatIsOpen } from "@piggo-legends/contrib";
+import { Position, Renderable, TextBox, chatBuffer, chatHistory, chatIsOpen } from "@piggo-legends/core";
 import { Text } from "pixi.js";
 
 export const Chat = (): Entity => {

modules/contrib/src/entities/Cursor.ts → modules/core/src/contrib/entities/Cursor.ts

@@ -1,5 +1,5 @@
 import { Entity, Renderer } from "@piggo-legends/core";
-import { Position, Renderable } from "@piggo-legends/contrib";
+import { Position, Renderable } from "@piggo-legends/core";
 import { Graphics } from "pixi.js";
 
 export const Cursor = (): Entity => {

modules/contrib/src/entities/DebugButton.ts → modules/core/src/contrib/entities/DebugButton.ts

@@ -1,5 +1,5 @@
 import { Entity, Game } from "@piggo-legends/core";
-import { Actions, Button, Clickable, Position } from "@piggo-legends/contrib";
+import { Actions, Button, Clickable, Position } from "@piggo-legends/core";
 import { Text } from "pixi.js";
 
 export const DebugButton = (): Entity => {

modules/contrib/src/entities/FpsText.ts → modules/core/src/contrib/entities/FpsText.ts

@@ -1,5 +1,5 @@
 import { Entity, Game } from "@piggo-legends/core";
-import { Position, Renderable } from "@piggo-legends/contrib";
+import { Position, Renderable } from "@piggo-legends/core";
 import { Text } from "pixi.js";
 
 export type FpsTextProps = {

modules/contrib/src/entities/FullscreenButton.ts → modules/core/src/contrib/entities/FullscreenButton.ts

@@ -1,5 +1,5 @@
 import { Entity, Game } from "@piggo-legends/core";
-import { Actions, Button, Clickable, Position } from "@piggo-legends/contrib";
+import { Actions, Button, Clickable, Position } from "@piggo-legends/core";
 import { Text } from "pixi.js";
 
 export const FullscreenButton = (id: string = "fullscreenButton"): Entity => ({

modules/contrib/src/entities/Skelly.ts → modules/core/src/contrib/entities/Skelly.ts

@@ -1,7 +1,5 @@
-import { Entity } from "@piggo-legends/core";
-import { Position, Networked, Clickable, Actions, Character, playerControlsEntity, Controller, WASDMovementCommands, Renderable, Health, Collider, WASDMovementPhysics, Debug } from "@piggo-legends/contrib";
-import { Assets, AnimatedSprite, SCALE_MODES, Container, Graphics } from "pixi.js";
-import { Bodies } from "matter-js";
+import { Actions, Character, Clickable, Collider, Controller, Debug, Entity, Health, Networked, Position, Renderable, WASDMovementCommands, WASDMovementPhysics, playerControlsEntity } from "@piggo-legends/core";
+import { AnimatedSprite, Assets, Container, Graphics, SCALE_MODES } from "pixi.js";
 
 export const Skelly = async (id: string, tint?: number): Promise<Entity> => {
 

modules/contrib/src/entities/SpaceBackground.ts → modules/core/src/contrib/entities/SpaceBackground.ts

@@ -1,5 +1,4 @@
-import { Entity } from "@piggo-legends/core";
-import { Position, Renderable } from "@piggo-legends/contrib";
+import { Entity, Position, Renderable } from "@piggo-legends/core";
 import { Sprite, TilingSprite } from "pixi.js"
 
 export const SpaceBackground = (): Entity => {

modules/contrib/src/entities/Spaceship.ts → modules/core/src/contrib/entities/Spaceship.ts

@@ -1,7 +1,5 @@
-import { Entity } from "@piggo-legends/core";
-import { Position, Networked, Clickable, Actions, Character, VehicleMovement, playerControlsEntity, Controller, VehicleMovementCommands, Renderable, Collider, Debug } from "@piggo-legends/contrib";
-import { Assets, AnimatedSprite } from "pixi.js";
-import { Bodies } from "matter-js";
+import { Actions, Character, Clickable, Collider, Controller, Debug, Entity, Networked, Position, Renderable, VehicleMovement, VehicleMovementCommands, playerControlsEntity } from "@piggo-legends/core";
+import { AnimatedSprite, Assets } from "pixi.js";
 
 export type SpaceshipProps = {
   id?: string,

modules/contrib/src/entities/TileFloor.ts → modules/core/src/contrib/entities/TileFloor.ts

@@ -1,5 +1,4 @@
-import { Entity, Renderer } from "@piggo-legends/core";
-import { Position, Renderable } from "@piggo-legends/contrib";
+import { Entity, Renderer, Position, Renderable } from "@piggo-legends/core";
 import { Assets, Texture, Resource, Matrix, Sprite, RenderTexture } from "pixi.js";
 
 let index = 0;

modules/contrib/src/entities/TilingSpriteFloor.ts → modules/core/src/contrib/entities/TilingSpriteFloor.ts

@@ -1,5 +1,4 @@
-import { Position, Renderable } from "@piggo-legends/contrib";
-import { Entity } from "@piggo-legends/core";
+import { Entity, Position, Renderable } from "@piggo-legends/core";
 import { Assets, TilingSprite } from "pixi.js";
 
 export const TilingSpriteFloor = async (rows: number, cols: number): Promise<Entity> => {

modules/contrib/src/entities/Wall.ts → modules/core/src/contrib/entities/Wall.ts

@@ -1,5 +1,4 @@
-import { Collider, Debug, Position } from "@piggo-legends/contrib";
-import { Entity } from "@piggo-legends/core";
+import { Collider, Debug, Entity, Position } from "@piggo-legends/core";
 
 export type WallProps = {
   x: number,

modules/contrib/src/entities/Zombie.ts → modules/core/src/contrib/entities/Zombie.ts

@@ -1,5 +1,4 @@
-import { Actions, Character, Clickable, Collider, Debug, Health, NPC, Networked, Position, Renderable, ZombieMovement, ZombieMovementCommands } from "@piggo-legends/contrib";
-import { Entity, Game } from "@piggo-legends/core";
+import { Actions, Character, Clickable, Collider, Debug, Entity, Game, Health, NPC, Networked, Position, Renderable, ZombieMovement, ZombieMovementCommands } from "@piggo-legends/core";
 import { AnimatedSprite, Assets, SCALE_MODES } from "pixi.js";
 
 let zombieId = 0;

modules/contrib/src/systems/ClickableSystem.ts → modules/core/src/contrib/systems/ClickableSystem.ts

@@ -1,5 +1,4 @@
-import { Entity, SystemBuilder } from "@piggo-legends/core";
-import { Actions, Clickable, Position } from "@piggo-legends/contrib";
+import { Entity, SystemBuilder, Actions, Clickable, Position } from "@piggo-legends/core";
 import { FederatedPointerEvent } from "pixi.js";
 
 export type Click = { x: number, y: number };

modules/contrib/src/systems/DebugSystem.ts → modules/core/src/contrib/systems/DebugSystem.ts

@@ -1,5 +1,4 @@
-import { Collider, DebugBounds, Position, Renderable, TextBox, worldToScreen } from "@piggo-legends/contrib";
-import { Entity, SystemBuilder } from "@piggo-legends/core";
+import { Collider, DebugBounds, Entity, Position, Renderable, SystemBuilder, TextBox, worldToScreen } from "@piggo-legends/core";
 import { Graphics, Text } from 'pixi.js';
 
 // DebugSystem adds visual debug information to renderered entities

modules/contrib/src/systems/EnemySpawnSystem.ts → modules/core/src/contrib/systems/EnemySpawnSystem.ts

@@ -1,5 +1,4 @@
-import { Zombie } from "@piggo-legends/contrib";
-import { Entity, SystemBuilder } from "@piggo-legends/core";
+import { Entity, SystemBuilder, Zombie } from "@piggo-legends/core";
 
 // EnemySpawnSystem spawns waves of enemies
 export const EnemySpawnSystem: SystemBuilder = ({ game }) => {

modules/contrib/src/systems/GuiSystem.ts → modules/core/src/contrib/systems/GuiSystem.ts

@@ -1,5 +1,4 @@
-import { Health, HealthBar, Position, Renderable } from "@piggo-legends/contrib";
-import { Entity, SystemBuilder } from "@piggo-legends/core";
+import { Entity, SystemBuilder, Health, HealthBar, Position, Renderable } from "@piggo-legends/core";
 
 // GuiSystem displays gui elements
 export const GuiSystem: SystemBuilder = ({ game, renderer, thisPlayerId, mode }) => {

modules/contrib/src/systems/InputSystem.ts → modules/core/src/contrib/systems/InputSystem.ts

@@ -1,5 +1,4 @@
-import { Entity, Game, SystemBuilder } from "@piggo-legends/core";
-import { Actions, Ball, Controlled, Controller, Spaceship, Zombie, localCommandBuffer } from "@piggo-legends/contrib";
+import { Actions, Ball, Controlled, Controller, Entity, Game, Spaceship, SystemBuilder, Zombie, localCommandBuffer } from "@piggo-legends/core";
 
 export var chatBuffer: string[] = [];
 export var chatHistory: string[] = [];

modules/contrib/src/systems/NPCSystem.ts → modules/core/src/contrib/systems/NPCSystem.ts

@@ -1,5 +1,4 @@
-import { Actions, NPC, localCommandBuffer } from "@piggo-legends/contrib";
-import { Entity, SystemBuilder } from "@piggo-legends/core";
+import { Entity, SystemBuilder, Actions, NPC, localCommandBuffer } from "@piggo-legends/core";
 
 // NPCSystem invokes ai logic for NPCs
 export const NPCSystem: SystemBuilder = ({ game }) => {

modules/contrib/src/systems/PhysicsSystem.ts → modules/core/src/contrib/systems/PhysicsSystem.ts

@@ -1,5 +1,4 @@
-import { Collider, Position } from "@piggo-legends/contrib";
-import { Entity, SystemBuilder } from '@piggo-legends/core';
+import { Entity, SystemBuilder, Collider, Position } from '@piggo-legends/core';
 import { Body, Composite, Engine } from "matter-js";
 
 // PhysicsSystem handles the movement of entities

modules/contrib/src/systems/PlayerSpawnSystem.ts → modules/core/src/contrib/systems/PlayerSpawnSystem.ts

@@ -1,5 +1,4 @@
-import { Entity, Game, SystemBuilder } from "@piggo-legends/core";
-import { Controlled, Controlling, Skelly } from "@piggo-legends/contrib";
+import { Entity, Game, SystemBuilder, Controlled, Controlling, Skelly } from "@piggo-legends/core";
 
 // PlayerSpawnSystem handles spawning characters for players
 export const PlayerSpawnSystem: SystemBuilder = ({ game, thisPlayerId }) => {

modules/contrib/src/systems/RenderSystem.ts → modules/core/src/contrib/systems/RenderSystem.ts

@@ -1,5 +1,4 @@
-import { Position, Renderable } from "@piggo-legends/contrib";
-import { Entity, SystemBuilder } from '@piggo-legends/core';
+import { Entity, SystemBuilder, Position, Renderable } from '@piggo-legends/core';
 
 // RenderSystem handles rendering entities in isometric or cartesian space
 export const RenderSystem: SystemBuilder = ({ renderer, mode, game }) => {

modules/contrib/src/systems/RtcNetcodeSystem.ts → modules/core/src/contrib/systems/RtcNetcodeSystem.ts

@@ -1,5 +1,4 @@
-import { Entity, Game, RtcPeer, SystemBuilder } from "@piggo-legends/core";
-import { Player, SerializedPosition } from "@piggo-legends/contrib";
+import { Entity, Game, RtcPeer, SystemBuilder, Player, SerializedPosition } from "@piggo-legends/core";
 
 type TickData = {
   type: "game",

modules/contrib/src/systems/WsNetcodeSystem.ts → modules/core/src/contrib/systems/WsNetcodeSystem.ts

@@ -1,5 +1,4 @@
-import { Entity, Game, SystemBuilder } from "@piggo-legends/core";
-import { Command, SerializedPosition, localCommandBuffer } from "@piggo-legends/contrib";
+import { Entity, Game, SystemBuilder, Command, SerializedPosition, localCommandBuffer } from "@piggo-legends/core";
 
 export type TickData = {
   type: "game"

modules/core/src/ecs/Entity.ts

@@ -1,4 +1,4 @@
-import { Actions, Clickable, Collider, Controlled, Controller, Controlling, Debug, Health, NPC, Name, Networked, Player, Position, Renderable } from "@piggo-legends/contrib";
+import { Actions, Clickable, Collider, Controlled, Controller, Controlling, Debug, Health, NPC, Name, Networked, Player, Position, Renderable } from "@piggo-legends/core";
 
 // TODO how to make this extendable
 type ComponentTypes =