refactor: silphius app structure

app/ecs/components/grabber.js

@@ -1,3 +0,0 @@
-import Component from '@/ecs/component.js';
-
-export default class Grabber extends Component {}

app/ecs/components/shop.js

@@ -1,3 +0,0 @@
-import Component from '@/ecs/component.js';
-
-export default class Shop extends Component {}

app/entry.server.jsx

@@ -14,7 +14,7 @@ import { renderToPipeableStream } from "react-dom/server";
 const ABORT_DELAY = 5_000;
 
 export async function handleUpgrade(request, socket, head) {
-  const {handleUpgrade} = await import('./server/websocket.js');
+  const {handleUpgrade} = await import('./silphius/server/websocket.js');
   handleUpgrade(request, socket, head);
 }
 

app/lib/particles.test.js

@@ -1,7 +1,7 @@
 import {expect, test} from 'vitest';
 
-import Components from '@/ecs/components/index.js';
-import Ecs from '@/ecs/ecs.js';
+import Components from '@/silphius/ecs/components/index.js';
+import Ecs from '@/silphius/ecs/ecs.js';
 
 import {Emitter} from './particles.js';
 

app/net/packets/tick.js

@@ -1,3 +0,0 @@
-import Packet from '@/net/packet.js';
-
-export default class Tick extends Packet {}

app/react/components/client-ecs.js

@@ -1,4 +1,4 @@
-import Ecs from '@/ecs/ecs.js';
+import Ecs from '@/silphius/ecs/ecs.js';
 import {readAsset} from '@/lib/resources.js';
 
 export default class ClientEcs extends Ecs {

app/react/components/dom/damages.jsx

@@ -1,6 +1,6 @@
 import {memo, useCallback, useRef} from 'react';
 
-import {DamageTypes} from '@/ecs/components/vulnerable.js';
+import {DamageTypes} from '@/silphius/ecs/components/vulnerable.js';
 import {useEcsTick} from '@/react/context/ecs.js';
 import useAnimationFrame from '@/react/hooks/use-animation-frame.js';
 import {easeInOutExpo, easeInQuint, easeOutQuad, linear} from '@/lib/easing.js';

app/react/components/particle-worker.js

@@ -1,5 +1,5 @@
 import {Emitter} from '@/lib/particles.js';
-import createEcs from '@/server/create/ecs.js';
+import createEcs from '@/silphius/server/create/ecs.js';
 
 import ClientEcs from './client-ecs.js';
 

app/routes/_main-menu.play.$.$/route.jsx

@@ -62,8 +62,8 @@ export default function PlaySpecific() {
   }, [ecsRef, Components, Systems]);
   useEffect(() => {
     async function setEcsStuff() {
-      const {default: Components} = await import('@/ecs/components/index.js');
-      const {default: Systems} = await import('@/ecs/systems/index.js');
+      const {default: Components} = await import('@/silphius/ecs/components/index.js');
+      const {default: Systems} = await import('@/silphius/ecs/systems/index.js');
       setComponents(Components);
       setSystems(Systems);
     }

app/routes/_main-menu.play.$/route.jsx

@@ -13,7 +13,7 @@ settings.ADAPTER.fetch = async (path) => {
 };
 
 export async function loader({request}) {
-  const {juggleSession} = await import('@/server/session.server.js');
+  const {juggleSession} = await import('@/silphius/server/session.server.js');
   const {loadManifest} = await import('@/lib/resources.server.js');
   await juggleSession(request);
   return json({
@@ -43,10 +43,10 @@ export default function Play() {
       let Client;
       switch (type) {
         case 'local':
-          ({default: Client} = await import('@/client/local.js'));
+          ({default: Client} = await import('@/silphius/client/local.js'));
           break;
         case 'remote':
-          ({default: Client} = await import('@/client/remote.js'));
+          ({default: Client} = await import('@/silphius/client/remote.js'));
           break;
       }
       setClient(() => Client);

app/routes/dev.gen._index/route.jsx

@@ -2,7 +2,7 @@
 import {Form, json, redirect, useLoaderData} from '@remix-run/react';
 import {useState} from 'react';
 
-import {commitSession, getSession, juggleSession} from '@/server/session.server.js';
+import {commitSession, getSession, juggleSession} from '@/silphius/server/session.server.js';
 
 import NoiseField from './noise-field.jsx';
 

app/silphius/client/local.js

@@ -1,5 +1,5 @@
-import Client from '@/net/client.js';
-import {decode, encode} from '@/net/packets/index.js';
+import Client from '@/silphius/net/client.js';
+import {decode, encode} from '@/silphius/net/packets/index.js';
 import {CLIENT_INTERPOLATION, CLIENT_PREDICTION} from '@/lib/constants.js';
 
 export default class LocalClient extends Client {

app/silphius/client/predictor.js

@@ -1,6 +1,6 @@
-import Components from '@/ecs/components/index.js';
-import Ecs from '@/ecs/ecs.js';
-import Systems from '@/ecs/systems/index.js';
+import Components from '@/silphius/ecs/components/index.js';
+import Ecs from '@/silphius/ecs/ecs.js';
+import Systems from '@/silphius/ecs/systems/index.js';
 import {get, loadResources, readAsset} from '@/lib/resources.js';
 
 class PredictionEcs extends Ecs {

app/silphius/client/remote.js

@@ -1,5 +1,5 @@
-import Client from '@/net/client.js';
-import {decode, encode} from '@/net/packets/index.js';
+import Client from '@/silphius/net/client.js';
+import {decode, encode} from '@/silphius/net/packets/index.js';
 import {CLIENT_INTERPOLATION, CLIENT_PREDICTION} from '@/lib/constants.js';
 
 export default class RemoteClient extends Client {

app/silphius/ecs/components/alive.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Alive extends Component {
   instanceFromSchema() {

app/silphius/ecs/components/animation.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Animation extends Component {
   static properties = {

app/silphius/ecs/components/arbitrary.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Arbitrary extends Component {
   instanceFromSchema() {

app/silphius/ecs/components/area-size.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class AreaSize extends Component {
   static properties = {

app/silphius/ecs/components/behaving.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Behaving extends Component {
   instanceFromSchema() {

app/silphius/ecs/components/camera.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Camera extends Component {
   static properties = {

app/silphius/ecs/components/collider.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 import {distance, intersects, transform} from '@/lib/math.js';
 
 import vector2d from './helpers/vector-2d';

app/silphius/ecs/components/controlled.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Controlled extends Component {
   instanceFromSchema() {

app/silphius/ecs/components/direction.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 import {HALF_PI, TAU} from '@/lib/math.js';
 
 export default class Direction extends Component {

app/silphius/ecs/components/ecs.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Ecs extends Component {
   static properties = {

app/silphius/ecs/components/emitter.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 import {Emitter} from '@/lib/particles.js';
 import Ticker from '@/lib/ticker.js';

app/silphius/ecs/components/forces.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Forces extends Component {
   instanceFromSchema() {

app/silphius/ecs/components/grabber.js

@@ -0,0 +1,3 @@
+import Component from '@/silphius/ecs/component.js';
+
+export default class Grabber extends Component {}

app/silphius/ecs/components/harmful.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Harmful extends Component {
   instanceFromSchema() {

app/silphius/ecs/components/health.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Health extends Component {
   static properties = {

app/silphius/ecs/components/interactive.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Interactive extends Component {
   instanceFromSchema() {

app/silphius/ecs/components/interacts.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Interacts extends Component {
   instanceFromSchema() {

app/silphius/ecs/components/interlocutor.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Interlocutor extends Component {
   mergeDiff(original, update) {

app/silphius/ecs/components/inventory.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 import {distribute} from '@/lib/inventory.js';
 

app/silphius/ecs/components/item-stack.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class ItemStack extends Component {
   instanceFromSchema() {

app/silphius/ecs/components/light.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Light extends Component {
   static properties = {

app/silphius/ecs/components/magnet.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Magnet extends Component {
   static properties = {

app/silphius/ecs/components/magnetic.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Magnetic extends Component {
 }

app/silphius/ecs/components/main-entity.js

@@ -1,3 +1,3 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class MainEntity extends Component {}

app/silphius/ecs/components/owned.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Owned extends Component {
   static properties = {

app/silphius/ecs/components/plant.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Plant extends Component {
   instanceFromSchema() {

app/silphius/ecs/components/player.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 const State = {
   CLOSED: 0,

app/silphius/ecs/components/position.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Position extends Component {
   instanceFromSchema() {

app/silphius/ecs/components/shop.js

@@ -0,0 +1,3 @@
+import Component from '@/silphius/ecs/component.js';
+
+export default class Shop extends Component {}

app/silphius/ecs/components/sound.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Sound extends Component {
   mergeDiff(original, update) {

app/silphius/ecs/components/speed.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Speed extends Component {
   static properties = {

app/silphius/ecs/components/sprite.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 import {hexToHsl, hslToHex} from '@/lib/color.js';
 
 export default class Sprite extends Component {

app/silphius/ecs/components/tags.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Tags extends Component {
   instanceFromSchema() {

app/silphius/ecs/components/ticking.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 import {withResolvers} from '@/lib/promise.js';
 
 export default class Ticking extends Component {

app/silphius/ecs/components/tile-layers.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 import {CHUNK_SIZE} from '@/lib/constants.js';
 import {floodwalk2D, ortho, removeCollinear} from '@/lib/math.js';
 

app/silphius/ecs/components/tile-layers.test.js

@@ -1,6 +1,6 @@
 import {expect, test} from 'vitest';
 
-import Ecs from '@/ecs/ecs.js';
+import Ecs from '@/silphius/ecs/ecs.js';
 
 import TileLayers from './tile-layers.js';
 

app/silphius/ecs/components/time.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 import {IRL_MINUTES_PER_GAME_DAY} from '@/lib/constants';
 
 const realSecondsPerGameDay = 60 * IRL_MINUTES_PER_GAME_DAY;

app/silphius/ecs/components/ttl.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Ttl extends Component {
   instanceFromSchema() {

app/silphius/ecs/components/visible-aabb.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class VisibleAabb extends Component {
   static properties = {

app/silphius/ecs/components/vulnerable.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 import * as Math from '@/lib/math.js';
 import Ticker from '@/lib/ticker.js';
 

app/silphius/ecs/components/wallet.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Wallet extends Component {
   static properties = {

app/silphius/ecs/components/water.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Water extends Component {
   static properties = {

app/silphius/ecs/components/wielder.js

@@ -1,4 +1,4 @@
-import Component from '@/ecs/component.js';
+import Component from '@/silphius/ecs/component.js';
 
 export default class Wielder extends Component {
   instanceFromSchema() {

app/silphius/ecs/systems/apply-control-movement.js

@@ -1,4 +1,4 @@
-import {System} from '@/ecs/index.js';
+import {System} from '@/silphius/ecs/index.js';
 import {normalizeVector} from '@/lib/math.js';
 
 export default class ApplyControlMovement extends System {

app/silphius/ecs/systems/attract.js

@@ -1,4 +1,4 @@
-import {System} from '@/ecs/index.js';
+import {System} from '@/silphius/ecs/index.js';
 import {distance, normalizeVector} from '@/lib/math.js';
 
 export default class Attract extends System {

app/silphius/ecs/systems/behave.js

@@ -1,4 +1,4 @@
-import {System} from '@/ecs/index.js';
+import {System} from '@/silphius/ecs/index.js';
 
 export default class Behave extends System {
 

app/silphius/ecs/systems/clamp-positions.js

@@ -1,4 +1,4 @@
-import {System} from '@/ecs/index.js';
+import {System} from '@/silphius/ecs/index.js';
 
 export default class ClampPositions extends System {
 

app/silphius/ecs/systems/colliders.js

@@ -1,4 +1,4 @@
-import {System} from '@/ecs/index.js';
+import {System} from '@/silphius/ecs/index.js';
 
 export default class Colliders extends System {
 

app/silphius/ecs/systems/control-direction.js

@@ -1,4 +1,4 @@
-import {System} from '@/ecs/index.js';
+import {System} from '@/silphius/ecs/index.js';
 import {TAU} from '@/lib/math.js';
 
 export default class ControlDirection extends System {

app/silphius/ecs/systems/follow-camera.js

@@ -1,4 +1,4 @@
-import {System} from '@/ecs/index.js';
+import {System} from '@/silphius/ecs/index.js';
 // import {RESOLUTION} from '@/lib/constants.js'
 
 // const [hx, hy] = [RESOLUTION.x / 2, RESOLUTION.y / 2];

app/silphius/ecs/systems/harm.js

@@ -1,4 +1,4 @@
-import {System} from '@/ecs/index.js';
+import {System} from '@/silphius/ecs/index.js';
 
 export default class Harm extends System {
 

app/silphius/ecs/systems/index.js

@@ -1,4 +1,4 @@
-import System from '@/ecs/system.js';
+import System from '@/silphius/ecs/system.js';
 import gather from '@/lib/gather.js';
 
 const gathered = gather(import.meta.glob('./*.js', {eager: true, import: 'default'}));

app/silphius/ecs/systems/integrate-physics.js

@@ -1,4 +1,4 @@
-import {System} from '@/ecs/index.js';
+import {System} from '@/silphius/ecs/index.js';
 
 export default class IntegratePhysics extends System {
 

app/silphius/ecs/systems/interactions.js

@@ -1,4 +1,4 @@
-import {System} from '@/ecs/index.js';
+import {System} from '@/silphius/ecs/index.js';
 
 export default class Interactions extends System {
 

app/silphius/ecs/systems/inventory-closer.js

@@ -1,4 +1,4 @@
-import {System} from '@/ecs/index.js';
+import {System} from '@/silphius/ecs/index.js';
 import {distance} from '@/lib/math.js';
 
 export default class InventoryCloser extends System {

app/silphius/ecs/systems/kill-perishable.js

@@ -1,4 +1,4 @@
-import {System} from '@/ecs/index.js';
+import {System} from '@/silphius/ecs/index.js';
 
 export default class KillPerishable extends System {
 

app/silphius/ecs/systems/maintain-collider-hash.js

@@ -1,4 +1,4 @@
-import {System} from '@/ecs/index.js';
+import {System} from '@/silphius/ecs/index.js';
 import SpatialHash from '@/lib/spatial-hash.js';
 
 export default class MaintainColliderHash extends System {