@terrafirmagreg-team/game 0.1.0 → 1.2.0

package/src/components/entry/list.tsx

@@ -1,9 +1,10 @@
 'use client';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 
 import { Entry } from '@terrafirmagreg-team/game/components/entry/entry';
-import { cn } from '@terrafirmagreg-team/ui/lib/utils/cn';
+import { SpriteList } from '@terrafirmagreg-team/ui/components/blocks/sprite';
 import type { Lang } from '@terrafirmagreg-team/translate/types/locale';
-import type { TaggedReference } from '@terrafirmagreg-team/game/lib/dump/contract/ref';
+import type { TaggedReference } from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
 
 export function EntryList({
   items,
@@ -18,7 +19,7 @@ export function EntryList({
   className,
 }: {
   items: TaggedReference[];
-  dataset?: string;
+  dataset?: DatasetRef;
   lang?: Lang;
   langMap?: Record<string, string>;
   tab?: string;
@@ -31,17 +32,13 @@ export function EntryList({
   className?: string;
 }) {
   return (
-    <ul
-      className={cn(
-        variant === 'grid'
-          ? 'grid grid-cols-[repeat(auto-fill,minmax(--spacing(9),1fr))] gap-1'
-          : 'flex flex-wrap items-center gap-3',
-        className,
-      )}
-    >
-      {items.map((item, index) => (
-        <li key={`${item.kind}:${item.id}:${index}`}>
-          {variant === 'grid' ? (
+    <SpriteList
+      variant={variant}
+      className={className}
+      items={items.map((item, index) => ({
+        key: `${item.kind}:${item.id}:${index}`,
+        node:
+          variant === 'grid' ? (
             <Entry
               reference={item}
               dataset={dataset}
@@ -62,9 +59,9 @@ export function EntryList({
               labeled={labeled}
               href={href}
             />
-          )}
-        </li>
-      ))}
-    </ul>
+          ),
+      }))}
+    />
   );
 }
+

package/src/components/entry/mc-text.tsx

@@ -1,92 +1,6 @@
-import { Fragment, type CSSProperties } from 'react';
-import { MC_FORMAT_COLORS } from '@terrafirmagreg-team/game/lib/dump/contract/text';
-
-const isCode = (char: string | undefined): char is string =>
-  char !== undefined && /[0-9a-fklmnor]/.test(char);
-
-type Run = { text: string; style?: CSSProperties };
+import { FormatText } from '@terrafirmagreg-team/ui/components/blocks/text/format-text';
+import { MC_FORMAT } from '@terrafirmagreg-team/dump/lib/dump/contract/text';
 
 export function McText({ text }: { text: string }) {
-  const runs: Run[] = [];
-  let style: CSSProperties | undefined;
-  let buf = '';
-  const flush = () => {
-    if (!buf) return;
-    runs.push(style ? { text: buf, style } : { text: buf });
-    buf = '';
-  };
-  for (let i = 0; i < text.length; i += 1) {
-    const ch = text[i];
-    if (ch !== '§') {
-      buf += ch;
-      continue;
-    }
-    const code = text[i + 1]?.toLowerCase();
-    if (code === 'x') {
-      let hex = '';
-      let j = i + 2;
-      while (
-        hex.length < 6 &&
-        text[j] === '§' &&
-        /^[0-9a-f]$/.test(text[j + 1]?.toLowerCase() ?? '')
-      ) {
-        hex += (text[j + 1] ?? '').toLowerCase();
-        j += 2;
-      }
-      if (hex.length === 6) {
-        flush();
-        i = j - 1;
-        const next: CSSProperties = { ...(style ?? {}), color: `#${hex}` };
-        delete next.fontWeight;
-        delete next.fontStyle;
-        delete next.textDecoration;
-        style = next;
-        continue;
-      }
-      buf += ch;
-      continue;
-    }
-    if (!isCode(code)) {
-      buf += ch;
-      continue;
-    }
-    flush();
-    i += 1;
-    if (code === 'r') {
-      style = undefined;
-      continue;
-    }
-    const next: CSSProperties = { ...(style ?? {}) };
-    const color = MC_FORMAT_COLORS[code];
-    if (color) {
-      next.color = color;
-      delete next.fontWeight;
-      delete next.fontStyle;
-      delete next.textDecoration;
-    } else if (code === 'l') next.fontWeight = 600;
-    else if (code === 'o') next.fontStyle = 'italic';
-    else if (code === 'n')
-      next.textDecoration = next.textDecoration
-        ? `${next.textDecoration} underline`
-        : 'underline';
-    else if (code === 'm')
-      next.textDecoration = next.textDecoration
-        ? `${next.textDecoration} line-through`
-        : 'line-through';
-    style = Object.keys(next).length ? next : undefined;
-  }
-  flush();
-  return (
-    <>
-      {runs.map((run, index) =>
-        run.style ? (
-          <span key={index} style={run.style}>
-            {run.text}
-          </span>
-        ) : (
-          <Fragment key={index}>{run.text}</Fragment>
-        ),
-      )}
-    </>
-  );
+  return <FormatText text={text} format={MC_FORMAT} />;
 }

package/src/components/entry/stack-count.tsx

@@ -1,14 +1,18 @@
-import { formatCount } from '@terrafirmagreg-team/ui/lib/utils/format';
+import { SpriteCount } from '@terrafirmagreg-team/ui/components/blocks/sprite';
 
-export function StackCount({ count }: { count: number }) {
-  if (count < 1) return null;
+export function StackCount({
+  count,
+  limit,
+}: {
+  count: number;
+  limit?: number;
+}) {
   return (
-    <span
-      aria-hidden
+    <SpriteCount
+      count={count}
+      limit={limit}
       className="font-mc pointer-events-none leading-none text-white"
       style={{ fontSize: 9, textShadow: '1px 1px 0 var(--color-mc-arrow)' }}
-    >
-      {formatCount(count)}
-    </span>
+    />
   );
 }

package/src/components/entry/tooltip.tsx

@@ -1,17 +1,13 @@
 'use client';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 
 import { useState, type ReactElement, type ReactNode } from 'react';
-import { useAsyncValue } from '@terrafirmagreg-team/ui/hooks/use-async-value';
 import { useModifierKeys } from '@terrafirmagreg-team/ui/hooks/use-modifier-keys';
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipTrigger,
-} from '@terrafirmagreg-team/ui/components/ui/tooltip';
+import { LazyTooltip } from '@terrafirmagreg-team/ui/components/blocks/tooltip/lazy';
 import { stackTooltip } from '@terrafirmagreg-team/game/lib/entry/tooltip';
 import { formulaRuns } from '@terrafirmagreg-team/game/lib/entry/formula';
 import { McText } from '@terrafirmagreg-team/game/components/entry/mc-text';
-import { stripMcFormat } from '@terrafirmagreg-team/game/lib/dump/assets/lang/names';
+import { stripMcFormat } from '@terrafirmagreg-team/dump/lib/dump/assets/lang/names';
 
 const ENCHANTED_TEXT_COLOR = 'var(--color-mc-enchant)';
 
@@ -51,7 +47,7 @@ export function EntryTooltip({
   footer,
   children,
 }: {
-  dataset: string;
+  dataset: DatasetRef;
   id: string;
   name: string;
   kind?: 'item' | 'fluid' | 'entity';
@@ -65,44 +61,43 @@ export function EntryTooltip({
 }) {
   const [open, setOpen] = useState(false);
   const held = useModifierKeys(open && (level === 'full' || level === 'adaptive'));
-  const tooltip =
-    useAsyncValue(
-      open ? () => stackTooltip(dataset, id, lang, langMap, kind) : false,
-      [open, dataset, id, lang, langMap, kind],
-    ) ?? { lines: [], mods: {} };
 
-  const base = tooltip.lines;
-  const modLine =
-    base.length > 1 && !base[base.length - 1].includes('§')
-      ? base[base.length - 1]
-      : undefined;
+  const renderLines = (value?: {
+    lines: string[];
+    mods: Record<string, string[]>;
+  }) => {
+    const tooltip = value ?? { lines: [], mods: {} };
+    const base = tooltip.lines;
+    const modLine =
+      base.length > 1 && !base[base.length - 1].includes('§')
+        ? base[base.length - 1]
+        : undefined;
 
-  let extra: string[];
-  if (level === 'compact') extra = modLine ? [modLine] : [];
-  else if (level === 'extended') extra = base;
-  else if (level === 'full') {
-    const activeMod = held.shift
-      ? 'shift'
-      : held.ctrl
-        ? 'ctrl'
-        : held.alt
-          ? 'alt'
-          : null;
-    extra = (activeMod ? tooltip.mods[activeMod] : undefined) ?? base;
-  } else if (held.ctrl || held.alt)
-    extra = (held.ctrl ? tooltip.mods.ctrl : tooltip.mods.alt) ?? base;
-  else if (held.shift) extra = base;
-  else extra = modLine ? [modLine] : [];
+    let extra: string[];
+    if (level === 'compact') extra = modLine ? [modLine] : [];
+    else if (level === 'extended') extra = base;
+    else if (level === 'full') {
+      const activeMod = held.shift
+        ? 'shift'
+        : held.ctrl
+          ? 'ctrl'
+          : held.alt
+            ? 'alt'
+            : null;
+      extra = (activeMod ? tooltip.mods[activeMod] : undefined) ?? base;
+    } else if (held.ctrl || held.alt)
+      extra = (held.ctrl ? tooltip.mods.ctrl : tooltip.mods.alt) ?? base;
+    else if (held.shift) extra = base;
+    else extra = modLine ? [modLine] : [];
 
-  const lines = extra.length
-    ? [name, ...extra.filter((line) => line !== name)]
-    : [name];
-  const lastIsMod = lines.length > 1 && !lines[lines.length - 1].includes('§');
+    const lines = extra.length
+      ? [name, ...extra.filter((line) => line !== name)]
+      : [name];
+    const lastIsMod =
+      lines.length > 1 && !lines[lines.length - 1].includes('§');
 
-  return (
-    <Tooltip onOpenChange={(next) => setOpen(next)}>
-      <TooltipTrigger render={children} delay={150} closeDelay={100} />
-      <TooltipContent className="flex-col items-start gap-0.5 p-3 text-sm break-words whitespace-pre-wrap">
+    return (
+      <>
         {lines.map((line, index) => (
           <p
             key={`${index}:${line}`}
@@ -123,7 +118,20 @@ export function EntryTooltip({
           </p>
         ))}
         {footer}
-      </TooltipContent>
-    </Tooltip>
+      </>
+    );
+  };
+
+  return (
+    <LazyTooltip
+      load={() => stackTooltip(dataset, id, lang, langMap, kind)}
+      deps={[dataset, id, lang, langMap, kind]}
+      onOpenChange={setOpen}
+      trigger={children}
+      contentClassName="flex-col items-start gap-0.5 p-3 text-sm break-words whitespace-pre-wrap"
+    >
+      {renderLines}
+    </LazyTooltip>
   );
 }
+

package/src/components/mdx/item-icon.tsx

@@ -2,35 +2,41 @@
 
 import { usePathname } from 'next/navigation';
 import type { ComponentProps } from 'react';
-import { ItemEntry } from '@terrafirmagreg-team/game/components/entry/entry';
+import { Entry } from '@terrafirmagreg-team/game/components/entry/entry';
 import { useEntryContext } from '@terrafirmagreg-team/game/hooks/use-entry-context';
 import { useLangMap } from '@terrafirmagreg-team/game/hooks/use-lang-map';
 import { useResolvedLang } from '@terrafirmagreg-team/translate/hooks/use-resolved-lang';
 import { useAsyncValue } from '@terrafirmagreg-team/ui/hooks/use-async-value';
-import { parseSectionLocation } from '@terrafirmagreg-team/kit/lib/location';
-import { lookupSpriteInBundle } from '@terrafirmagreg-team/game/lib/dump/assets/atlas/lookup';
-import { stackDisplayName } from '@terrafirmagreg-team/game/lib/dump/assets/lang/names';
-import { loadClientModAtlases } from '@terrafirmagreg-team/game/lib/dump/client/atlases';
+import {
+  type DatasetRef,
+  parseSectionLocation,
+} from '@terrafirmagreg-team/sites/location';
+import { lookupSpriteInBundle } from '@terrafirmagreg-team/dump/lib/dump/assets/atlas/lookup';
+import { stackDisplayName } from '@terrafirmagreg-team/dump/lib/dump/assets/lang/names';
+import { loadClientModAtlases } from '@terrafirmagreg-team/dump/lib/dump/client/atlases';
 import { fetchTagItem } from '@terrafirmagreg-team/game/lib/entry/icon-load';
 import type { Lang } from '@terrafirmagreg-team/translate/types/locale';
 
+export type ItemIconProps = {
+  id?: string;
+  dataset?: DatasetRef;
+  lang?: Lang;
+  label?: string;
+  children?: React.ReactNode;
+} & ComponentProps<'div'>;
+
 export function ItemIcon({
   id,
   dataset: datasetProp,
   lang: langProp,
   label,
   children,
-}: {
-  id?: string;
-  dataset?: string;
-  lang?: Lang;
-  label?: string;
-  children?: React.ReactNode;
-} & ComponentProps<'div'>) {
+}: ItemIconProps) {
   const ctx = useEntryContext();
   const pathname = usePathname();
+  const locId = parseSectionLocation(pathname).dataset;
   const dataset =
-    datasetProp ?? ctx?.dataset ?? parseSectionLocation(pathname).dataset;
+    datasetProp ?? ctx?.dataset ?? (locId ? { id: locId } : undefined);
   const resolvedLang = useResolvedLang();
   const lang = langProp ?? ctx?.lang ?? resolvedLang;
   const iconId = useAsyncValue(
@@ -54,7 +60,8 @@ export function ItemIcon({
     label ?? (iconId ? stackDisplayName(map, iconId, undefined, langKey) : undefined);
   if (!iconId) return children ? <>{children}</> : null;
   return (
-    <ItemEntry
+    <Entry
+      kind="item"
       id={iconId}
       dataset={dataset}
       lang={lang}
@@ -64,6 +71,7 @@ export function ItemIcon({
       href={false}
     >
       {children}
-    </ItemEntry>
+    </Entry>
   );
 }
+

package/src/components/preview-icon.tsx

@@ -2,7 +2,7 @@
 
 import { DynamicIcon, type IconName } from 'lucide-react/dynamic';
 import { EntryIcon } from '@terrafirmagreg-team/game/components/entry/icon';
-import type { ReferenceKind } from '@terrafirmagreg-team/game/lib/dump/contract/ref';
+import type { ReferenceKind } from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
 import type { PreviewIcon } from '@terrafirmagreg-team/ui/types/preview';
 
 export function PagePreviewIcon({ icon }: { icon: PreviewIcon }) {
@@ -23,3 +23,4 @@ export function PagePreviewIcon({ icon }: { icon: PreviewIcon }) {
     />
   );
 }
+

package/src/hooks/use-dump-location.ts

@@ -1,14 +1,15 @@
 'use client';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 
 import { useSyncExternalStore } from 'react';
 import {
   dumpLocation,
   subscribeDumpLocations,
   type DumpLocation,
-} from '@terrafirmagreg-team/game/lib/dump/paths';
+} from '@terrafirmagreg-team/dump/lib/dump/paths';
 
 export function useDumpLocation(
-  dataset: string | undefined,
+  dataset: DatasetRef | undefined,
 ): DumpLocation | undefined {
   return useSyncExternalStore(
     subscribeDumpLocations,
@@ -16,3 +17,4 @@ export function useDumpLocation(
     () => undefined,
   );
 }
+

package/src/hooks/use-entry-context.ts

@@ -1,4 +1,5 @@
 'use client';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 
 import {
   createContext,
@@ -10,7 +11,7 @@ import {
 import type { Lang } from '@terrafirmagreg-team/translate/types/locale';
 
 type EntryContextValue = {
-  dataset: string;
+  dataset: DatasetRef;
   lang?: Lang;
   langMap?: Record<string, string>;
 };
@@ -33,3 +34,4 @@ export function EntryProvider({
 export function useEntryContext(): EntryContextValue | null {
   return useContext(EntryContext);
 }
+

package/src/hooks/use-icon-source.ts

@@ -7,11 +7,12 @@ import {
   isTagKind,
   parseStackId,
   tagKindOf,
-} from '@terrafirmagreg-team/game/lib/dump/contract/ref';
-import { texturePublicUrl } from '@terrafirmagreg-team/game/lib/dump/assets/urls';
+} from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
+import { texturePublicUrl } from '@terrafirmagreg-team/dump/lib/dump/assets/urls';
 import { useDumpLocation } from '@terrafirmagreg-team/game/hooks/use-dump-location';
-import { lookupSpriteInBundle } from '@terrafirmagreg-team/game/lib/dump/assets/atlas/lookup';
-import type { AtlasLookup } from '@terrafirmagreg-team/game/lib/dump/assets/atlas/dto';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
+import { lookupSpriteInBundle } from '@terrafirmagreg-team/dump/lib/dump/assets/atlas/lookup';
+import type { AtlasLookup } from '@terrafirmagreg-team/dump/lib/dump/assets/atlas/dto';
 import {
   blockItemId,
   fetchAtlases,
@@ -21,13 +22,13 @@ import {
   peekEntityTexture,
   peekTagMembers,
 } from '@terrafirmagreg-team/game/lib/entry/icon-load';
-import { loadClientModAtlases } from '@terrafirmagreg-team/game/lib/dump/client/atlases';
+import { loadClientModAtlases } from '@terrafirmagreg-team/dump/lib/dump/client/atlases';
 import { stackKindOf } from '@terrafirmagreg-team/game/lib/entry/icon';
 import type {
   DumpNbt,
   ReferenceKind,
   TaggedReference,
-} from '@terrafirmagreg-team/game/lib/dump/contract/ref';
+} from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
 
 export const ENTRY_CYCLE_MS = 1500;
 
@@ -61,14 +62,16 @@ export function useIconSource({
   tag,
   missing,
   preferVariant,
+  entityView = 'auto',
 }: {
-  dataset?: string;
+  dataset?: DatasetRef;
   reference?: TaggedReference;
   id?: string;
   kind?: ReferenceKind;
   tag?: DumpNbt;
   missing: 'placeholder' | 'item' | 'hide';
   preferVariant?: boolean;
+  entityView?: 'auto' | 'texture' | 'egg';
 }): IconSource {
   const ref = reference ?? (id ? classifyRefId(id, kind) : undefined);
   const refKind = ref?.kind;
@@ -77,7 +80,7 @@ export function useIconSource({
   const tagMemberKind = tagKindOf(refKind);
   const tagKey =
     dataset && rawId && isTagKind(refKind)
-      ? `${dataset}/${tagMemberKind ?? 'item'}/${rawId}`
+      ? `${dataset.id}/${dataset.version ?? ''}/${tagMemberKind ?? 'item'}/${rawId}`
       : null;
   const tagMembersPeek = tagKey
     ? peekTagMembers(dataset!, rawId, tagMemberKind ?? 'item')
@@ -130,7 +133,7 @@ export function useIconSource({
       : refKind;
   const blockKey =
     dataset && memberKind === 'block' && itemId && !itemId.startsWith('#')
-      ? `${dataset}/${itemId}`
+      ? `${dataset.id}/${dataset.version ?? ''}/${itemId}`
       : null;
   const blockPeek = blockKey ? peekBlockItem(dataset!, itemId!) : undefined;
   const blockHit = useAsyncResult(
@@ -159,7 +162,7 @@ export function useIconSource({
   const parsed = parseStackId(resolvedId.replace(/^#/, ''));
   const spriteId = parsed.id;
   const eggId =
-    isEntity && spriteId && !spriteId.startsWith('#')
+    isEntity && entityView !== 'texture' && spriteId && !spriteId.startsWith('#')
       ? `${spriteId}_spawn_egg`
       : undefined;
   const usesAtlas =
@@ -185,18 +188,22 @@ export function useIconSource({
     [atlasNeedsLoad, atlasPeek, dataset, modId],
   );
   const atlasValue = atlasPeek === undefined ? atlases.value : atlasBundle;
-  const sourceKey = `${dataset}:${displayKind}:${resolvedId}`;
+  const sourceKey = `${dataset?.id}/${dataset?.version ?? ''}:${displayKind}:${resolvedId}`;
   const dumpLoc = useDumpLocation(dataset);
+  const wantEntityTexture = isEntity && entityView !== 'egg';
   const texturePeek =
     dataset && isTexture && rawId
       ? texturePublicUrl(dataset, rawId)
-      : dataset && isEntity && resolvedId
+      : dataset && wantEntityTexture && resolvedId
         ? peekEntityTexture(dataset, resolvedId, nbt)
         : null;
   const textureSrc = useAsyncResult(
     dataset && isTexture && rawId
       ? false
-      : dataset && isEntity && resolvedId && texturePeek === undefined
+      : dataset &&
+            wantEntityTexture &&
+            resolvedId &&
+            texturePeek === undefined
         ? async () => ({
             key: sourceKey,
             url:
@@ -206,6 +213,7 @@ export function useIconSource({
     [
       isTexture,
       isEntity,
+      wantEntityTexture,
       dataset,
       rawId,
       resolvedId,
@@ -295,3 +303,4 @@ export function useIconSource({
     isEntity,
   };
 }
+

package/src/hooks/use-lang-map.ts

@@ -1,10 +1,11 @@
 'use client';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 
 import { useAsyncResult } from '@terrafirmagreg-team/ui/hooks/use-async-value';
-import { dumpReader } from '@terrafirmagreg-team/game/lib/dump/reader';
+import { dumpReader } from '@terrafirmagreg-team/dump/lib/dump/reader';
 
 export function useLangMap(
-  dataset: string | undefined,
+  dataset: DatasetRef | undefined,
   lang: string | undefined,
   enabled = true,
 ): Record<string, string> | undefined {
@@ -16,3 +17,4 @@ export function useLangMap(
   );
   return pending ? undefined : value;
 }
+

package/src/lib/entry/display.ts

@@ -1,4 +1,5 @@
 export {
   stackDisplay,
   stackDisplayName,
-} from '@terrafirmagreg-team/game/lib/dump/assets/lang/names';
+} from '@terrafirmagreg-team/dump/lib/dump/assets/lang/names';
+

package/src/lib/entry/entry.ts

@@ -1,6 +1,7 @@
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 import { entryHref } from '@terrafirmagreg-team/game/lib/entry/href';
-import { tagKindOf } from '@terrafirmagreg-team/game/lib/dump/contract/ref';
-import type { ReferenceKind } from '@terrafirmagreg-team/game/lib/dump/contract/ref';
+import { tagKindOf } from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
+import type { ReferenceKind } from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
 import type { EntryProps } from '@terrafirmagreg-team/game/types/entry';
 
 export function usesStackTooltip(kind: ReferenceKind | undefined): boolean {
@@ -27,7 +28,7 @@ export function tooltipLoadKind(
 }
 
 export function resolveEntryHref(
-  props: EntryProps & { dataset: string },
+  props: EntryProps & { dataset: DatasetRef },
 ): string | undefined {
   if (props.href === false) return undefined;
   if (typeof props.href === 'string') return props.href;
@@ -55,3 +56,4 @@ export function resolveEntryHref(
     },
   );
 }
+

package/src/lib/entry/formula.ts

@@ -224,3 +224,4 @@ export function formulaRuns(plain: string): FormulaRun[] | null {
   }
   return elements > 0 ? runs : null;
 }
+