diff --git a/lib/aliases.mjs b/lib/aliases.mjs index d4418c4..bdcac20 100644 --- a/lib/aliases.mjs +++ b/lib/aliases.mjs @@ -6,7 +6,7 @@ const moduleAliases = { "@tasks": "./out/src/registries/Tasks.js", "@items": "./out/src/registries/Items.js", "@world": "./out/src/World.js", - "@ui": "./out/src/ui/UI.js", + "@ui": "./out/src/term-ui/UI.js", "@game": "./out/src/Game.js" }; diff --git a/src/Game.ts b/src/Game.ts index fdab4f3..e5609db 100644 --- a/src/Game.ts +++ b/src/Game.ts @@ -3,9 +3,8 @@ import { DEBUG } from 'frigid/out/Serializable.js'; import { Pawn } from './Pawn.js'; import { TaskList } from './TaskList.js'; import { Inventory } from './Inventory.js'; -import { Menu } from './ui/Menu.js'; import Time, { Tickable } from './Time.js'; -import { render, Renderable, setTitle, start } from '@ui'; +import { render, Renderable, setTitle, start, Menu } from '@ui'; import { ready } from './multiplayer/mDNS.js'; import faker from 'faker'; import { World } from '@world'; diff --git a/src/Inventory.ts b/src/Inventory.ts index 60370ee..fbda7cb 100644 --- a/src/Inventory.ts +++ b/src/Inventory.ts @@ -1,8 +1,7 @@ import { Serializable } from 'frigid'; import { Game } from './Game.js'; import { Item, ItemState } from './registries/Items.js'; -import { Popup } from './ui/Popup.js'; -import { Renderable } from '@ui'; +import { Renderable, Popup } from '@ui'; export class Inventory extends Serializable implements Renderable { items: ItemState[]; diff --git a/src/multiplayer/mDNS.ts b/src/multiplayer/mDNS.ts index 2aeeed6..8b23e75 100644 --- a/src/multiplayer/mDNS.ts +++ b/src/multiplayer/mDNS.ts @@ -6,7 +6,7 @@ import faker from 'faker'; import chalk from 'chalk'; import { Item } from '../registries/Items.js'; import WebSocket from 'ws'; -import { Popup } from '../ui/Popup.js'; +import { Popup } from '@ui'; import { inspect } from 'util' import { Pawn } from '../Pawn.js'; import { Game } from '../Game.js'; diff --git a/src/ui/EscapeMenu.ts b/src/term-ui/EscapeMenu.ts similarity index 97% rename from src/ui/EscapeMenu.ts rename to src/term-ui/EscapeMenu.ts index 3cd9f49..1600cf7 100644 --- a/src/ui/EscapeMenu.ts +++ b/src/term-ui/EscapeMenu.ts @@ -1,6 +1,6 @@ import { Game } from "@game"; import { boxStyle, getTheme } from "@themes"; -import { panels } from "@ui"; +import { panels } from "./UI.js"; import blessed from 'neo-blessed'; import { quit, restart } from "../index.js"; @@ -25,10 +25,6 @@ export class EscapeMenu { top: 3, left: 'center', width: 20, - - - - height: 'shrink', content: '', tags: true, diff --git a/src/ui/GiftPopup.ts b/src/term-ui/GiftPopup.ts similarity index 98% rename from src/ui/GiftPopup.ts rename to src/term-ui/GiftPopup.ts index 23e16c6..f8cf5d6 100644 --- a/src/ui/GiftPopup.ts +++ b/src/term-ui/GiftPopup.ts @@ -5,7 +5,7 @@ import { ItemState } from '../registries/Items.js'; import { Player } from "../multiplayer/Player"; import { Pawn } from '../Pawn.js'; import { getTheme, boxStyle } from '@themes'; -import { panels } from '@ui'; +import { panels } from './UI.js'; export class GiftPopup { box; diff --git a/src/ui/Menu.ts b/src/term-ui/Menu.ts similarity index 95% rename from src/ui/Menu.ts rename to src/term-ui/Menu.ts index 824f4b5..76c5635 100644 --- a/src/ui/Menu.ts +++ b/src/term-ui/Menu.ts @@ -1,5 +1,5 @@ import { Pawn } from '../Pawn.js'; -import { panels, Renderable } from '@ui'; +import { panels, Renderable } from './UI.js'; import { Game } from '../Game.js'; import { progressbar, stats } from '../Progressbar.js'; import { Popup } from './Popup.js'; diff --git a/src/ui/PawnDetails.ts b/src/term-ui/PawnDetails.ts similarity index 94% rename from src/ui/PawnDetails.ts rename to src/term-ui/PawnDetails.ts index 0fbf6c8..971db0a 100644 --- a/src/ui/PawnDetails.ts +++ b/src/term-ui/PawnDetails.ts @@ -4,7 +4,7 @@ import { Game } from '../Game.js'; import { stringify } from '../Memory.js'; import { Pawn } from '../Pawn.js'; import Time from '../Time.js'; -import { panels } from '@ui'; +import { panels } from './UI.js'; import { boxStyle } from '@themes'; export class PawnDetails { diff --git a/src/ui/Popup.ts b/src/term-ui/Popup.ts similarity index 92% rename from src/ui/Popup.ts rename to src/term-ui/Popup.ts index 3ddc615..c865f85 100644 --- a/src/ui/Popup.ts +++ b/src/term-ui/Popup.ts @@ -2,7 +2,7 @@ import chalk from 'chalk'; import blessed from 'neo-blessed'; import { Game } from '../Game.js'; import { boxStyle, getTheme } from '@themes'; -import { panels } from '@ui'; +import { panels } from './UI.js'; export class Popup { box; diff --git a/src/ui/SelectItem.ts b/src/term-ui/SelectItem.ts similarity index 98% rename from src/ui/SelectItem.ts rename to src/term-ui/SelectItem.ts index 97493e3..3edfeca 100644 --- a/src/ui/SelectItem.ts +++ b/src/term-ui/SelectItem.ts @@ -1,7 +1,7 @@ import { Game } from "@game"; import { ItemState } from "@items"; import { boxStyle, getTheme } from "@themes"; -import { panels } from "@ui"; +import { panels } from "./UI"; import EventEmitter from "events"; import blessed from 'neo-blessed'; diff --git a/src/ui/SelectionBox.ts b/src/term-ui/SelectionBox.ts similarity index 95% rename from src/ui/SelectionBox.ts rename to src/term-ui/SelectionBox.ts index c0ebf24..a4001d0 100644 --- a/src/ui/SelectionBox.ts +++ b/src/term-ui/SelectionBox.ts @@ -1,4 +1,4 @@ -import { Renderable, RenderMode } from '@ui'; +import { Renderable, RenderMode } from './UI'; import { KeypressAcceptor } from './Menu.js'; import { getTheme } from '@themes'; diff --git a/src/ui/UI.ts b/src/term-ui/UI.ts similarity index 96% rename from src/ui/UI.ts rename to src/term-ui/UI.ts index cec0139..a93c14c 100644 --- a/src/ui/UI.ts +++ b/src/term-ui/UI.ts @@ -3,6 +3,7 @@ import blessed from 'neo-blessed'; import ansi from 'sisteransi'; import { boxStyle, getTheme } from '@themes'; export { Popup } from './Popup.js'; +export { Menu } from './Menu.js' export interface Renderable { render(mode?: RenderMode): string diff --git a/src/ui/View.ts b/src/term-ui/View.ts similarity index 86% rename from src/ui/View.ts rename to src/term-ui/View.ts index a8a6da8..799ad16 100644 --- a/src/ui/View.ts +++ b/src/term-ui/View.ts @@ -1,4 +1,4 @@ -import { Renderable } from '@ui'; +import { Renderable } from './UI'; import { KeypressAcceptor } from './Menu.js'; export abstract class View implements Renderable, KeypressAcceptor { diff --git a/src/ui/view/InventoryView.ts b/src/term-ui/view/InventoryView.ts similarity index 100% rename from src/ui/view/InventoryView.ts rename to src/term-ui/view/InventoryView.ts diff --git a/src/ui/view/MultiplayerView.ts b/src/term-ui/view/MultiplayerView.ts similarity index 100% rename from src/ui/view/MultiplayerView.ts rename to src/term-ui/view/MultiplayerView.ts diff --git a/src/ui/view/PawnsView.ts b/src/term-ui/view/PawnsView.ts similarity index 97% rename from src/ui/view/PawnsView.ts rename to src/term-ui/view/PawnsView.ts index 4b779bb..e4a1747 100644 --- a/src/ui/view/PawnsView.ts +++ b/src/term-ui/view/PawnsView.ts @@ -2,7 +2,7 @@ import { getTheme } from "@themes"; import { Game } from "../../Game.js"; import { progressbar } from "../../Progressbar.js"; import { PawnDetails } from "../PawnDetails.js"; -import { panels } from "@ui"; +import { panels } from "../UI"; import { View } from "../View.js"; export default class PawnsView extends View { diff --git a/src/ui/view/WorldView.ts b/src/term-ui/view/WorldView.ts similarity index 100% rename from src/ui/view/WorldView.ts rename to src/term-ui/view/WorldView.ts diff --git a/tsconfig.json b/tsconfig.json index acf9e23..45fe9ad 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -13,7 +13,7 @@ "@tasks": ["./src/registries/Tasks"], "@items": ["./src/registries/Items"], "@world": ["./src/World"], - "@ui": ["./src/ui/UI"], + "@ui": ["./src/term-ui/UI"], "@game": ["./src/Game"] }, "noImplicitAny": true