diff --git a/app/ecs-components/tile-layers.js b/app/ecs-components/tile-layers.js index 8c74a20..f41d8d4 100644 --- a/app/ecs-components/tile-layers.js +++ b/app/ecs-components/tile-layers.js @@ -1,5 +1,5 @@ -import {CHUNK_SIZE} from '@/constants.js'; import Component from '@/ecs/component.js'; +import {CHUNK_SIZE} from '@/util/constants.js'; import {floodwalk2D, ortho, removeCollinear} from '@/util/math.js'; import vector2d from './helpers/vector-2d'; diff --git a/app/ecs-components/time.js b/app/ecs-components/time.js index 6b5c0b7..ca1fddc 100644 --- a/app/ecs-components/time.js +++ b/app/ecs-components/time.js @@ -1,5 +1,5 @@ -import {IRL_MINUTES_PER_GAME_DAY} from '@/constants'; import Component from '@/ecs/component.js'; +import {IRL_MINUTES_PER_GAME_DAY} from '@/util/constants'; const realSecondsPerGameDay = 60 * IRL_MINUTES_PER_GAME_DAY; const realSecondsPerGameHour = realSecondsPerGameDay / 24; diff --git a/app/ecs-systems/follow-camera.js b/app/ecs-systems/follow-camera.js index 11e0da6..8638d72 100644 --- a/app/ecs-systems/follow-camera.js +++ b/app/ecs-systems/follow-camera.js @@ -1,5 +1,5 @@ -// import {RESOLUTION} from '@/constants.js' import {System} from '@/ecs/index.js'; +// import {RESOLUTION} from '@/util/constants.js' // const [hx, hy] = [RESOLUTION.x / 2, RESOLUTION.y / 2]; diff --git a/app/engine.js b/app/engine.js index 2372d59..3a30748 100644 --- a/app/engine.js +++ b/app/engine.js @@ -1,10 +1,10 @@ +import Ecs from '@/ecs/ecs.js'; +import {decode, encode} from '@/packets/index.js'; import { CHUNK_SIZE, RESOLUTION, TPS, -} from '@/constants.js'; -import Ecs from '@/ecs/ecs.js'; -import {decode, encode} from '@/packets/index.js'; +} from '@/util/constants.js'; import Script from '@/util/script.js'; import createEcs from './create/ecs.js'; diff --git a/app/net/client/client.js b/app/net/client/client.js index cf36c3e..692720d 100644 --- a/app/net/client/client.js +++ b/app/net/client/client.js @@ -1,4 +1,4 @@ -import {CLIENT_LATENCY} from '@/constants.js'; +import {CLIENT_LATENCY} from '@/util/constants.js'; export default class Client { constructor() { diff --git a/app/net/client/remote.js b/app/net/client/remote.js index e17b9c7..759ad52 100644 --- a/app/net/client/remote.js +++ b/app/net/client/remote.js @@ -1,5 +1,5 @@ -import {CLIENT_PREDICTION} from '@/constants.js'; import {encode} from '@/packets/index.js'; +import {CLIENT_PREDICTION} from '@/util/constants.js'; import Client from './client.js'; diff --git a/app/net/server/server.js b/app/net/server/server.js index 3b2c7dd..c6d6d53 100644 --- a/app/net/server/server.js +++ b/app/net/server/server.js @@ -1,4 +1,4 @@ -import {SERVER_LATENCY} from '@/constants.js'; +import {SERVER_LATENCY} from '@/util/constants.js'; export default class Server { constructor() { diff --git a/app/react/components/dom/chat/message.jsx b/app/react/components/dom/chat/message.jsx index 6bdd69d..7bd9e75 100644 --- a/app/react/components/dom/chat/message.jsx +++ b/app/react/components/dom/chat/message.jsx @@ -1,7 +1,7 @@ import {memo, useEffect, useState} from 'react'; -import {render} from '@/dialogue.js'; import {useRadians} from '@/react/context/radians.js'; +import {render} from '@/util/dialogue.js'; import styles from './message.module.css'; diff --git a/app/react/components/dom/dialogue.jsx b/app/react/components/dom/dialogue.jsx index 08ed002..225af34 100644 --- a/app/react/components/dom/dialogue.jsx +++ b/app/react/components/dom/dialogue.jsx @@ -1,9 +1,9 @@ import {useEffect, useMemo, useRef, useState} from 'react'; -import {RESOLUTION} from '@/constants.js'; -import {render} from '@/dialogue.js'; import {useDomScale} from '@/react/context/dom-scale.js'; import {useRadians} from '@/react/context/radians.js'; +import {RESOLUTION} from '@/util/constants.js'; +import {render} from '@/util/dialogue.js'; import styles from './dialogue.module.css'; diff --git a/app/react/components/dom/dom.jsx b/app/react/components/dom/dom.jsx index 534a9f2..10cfd91 100644 --- a/app/react/components/dom/dom.jsx +++ b/app/react/components/dom/dom.jsx @@ -1,7 +1,7 @@ import {useEffect, useRef, useState} from 'react'; -import {RESOLUTION} from '@/constants.js'; import DomContext from '@/react/context/dom-scale.js'; +import {RESOLUTION} from '@/util/constants.js'; import styles from './dom.module.css'; diff --git a/app/react/components/dom/entities.jsx b/app/react/components/dom/entities.jsx index 4f96bcf..5afca90 100644 --- a/app/react/components/dom/entities.jsx +++ b/app/react/components/dom/entities.jsx @@ -1,8 +1,8 @@ import {useState} from 'react'; -import {parseLetters} from '@/dialogue.js'; import {usePacket} from '@/react/context/client.js'; import {useEcs, useEcsTick} from '@/react/context/ecs.js'; +import {parseLetters} from '@/util/dialogue.js'; import Entity from './entity.jsx'; diff --git a/app/react/components/pixi/pixi.jsx b/app/react/components/pixi/pixi.jsx index 00d82b5..a0b7847 100644 --- a/app/react/components/pixi/pixi.jsx +++ b/app/react/components/pixi/pixi.jsx @@ -3,13 +3,13 @@ import {BaseTexture, extensions} from '@pixi/core'; import {Stage as PixiStage} from '@pixi/react'; import {createElement, useContext} from 'react'; -import {RESOLUTION} from '@/constants.js'; import AssetsContext from '@/react/context/assets.js'; import ClientContext from '@/react/context/client.js'; import DebugContext from '@/react/context/debug.js'; import EcsContext from '@/react/context/ecs.js'; import MainEntityContext from '@/react/context/main-entity.js'; import RadiansContext from '@/react/context/radians.js'; +import {RESOLUTION} from '@/util/constants.js'; import Ecs from './ecs.jsx'; import {ApplicationStageLayers, ApplicationStageLights} from './extensions.js'; diff --git a/app/react/components/pixi/tile-layer.jsx b/app/react/components/pixi/tile-layer.jsx index f46ce7d..87920f9 100644 --- a/app/react/components/pixi/tile-layer.jsx +++ b/app/react/components/pixi/tile-layer.jsx @@ -5,8 +5,8 @@ import {Sprite} from '@pixi/sprite'; import '@pixi/spritesheet'; // NECESSARY! import {CompositeTilemap} from '@pixi/tilemap'; -import {CHUNK_SIZE} from '@/constants.js'; import {useAsset} from '@/react/context/assets.js'; +import {CHUNK_SIZE} from '@/util/constants.js'; import {deferredLighting} from './lights.js'; diff --git a/app/react/components/ui.jsx b/app/react/components/ui.jsx index fb7f448..1d9e4db 100644 --- a/app/react/components/ui.jsx +++ b/app/react/components/ui.jsx @@ -1,10 +1,10 @@ import {memo, useEffect, useRef, useState} from 'react'; -import {RESOLUTION} from '@/constants.js'; import {useClient, usePacket} from '@/react/context/client.js'; import {useDebug} from '@/react/context/debug.js'; import {useEcs, useEcsTick} from '@/react/context/ecs.js'; import {useMainEntity} from '@/react/context/main-entity.js'; +import {RESOLUTION} from '@/util/constants.js'; import addKeyListener from './add-key-listener.js'; import ClientEcs from './client-ecs.js'; diff --git a/app/constants.js b/app/util/constants.js similarity index 100% rename from app/constants.js rename to app/util/constants.js diff --git a/app/dialogue.js b/app/util/dialogue.js similarity index 100% rename from app/dialogue.js rename to app/util/dialogue.js diff --git a/stories/dom-decorator.jsx b/stories/dom-decorator.jsx index a4bee7b..42da7a9 100644 --- a/stories/dom-decorator.jsx +++ b/stories/dom-decorator.jsx @@ -1,7 +1,7 @@ import {useEffect, useRef, useState} from 'react'; import Dom from '@/react/components/dom.jsx'; -import {RESOLUTION} from '@/constants.js'; +import {RESOLUTION} from '@/util/constants.js'; function Decorator({children, style}) { const ref = useRef();