@terrafirmagreg-team/game 0.1.0 → 1.2.0

package/src/lib/entry/href.ts

@@ -1,8 +1,11 @@
-import { sectionUrl } from '@terrafirmagreg-team/kit/lib/location';
+import {
+  type DatasetRef,
+  sectionUrl,
+} from '@terrafirmagreg-team/sites/location';
 import { encodeQuery, withLang } from '@terrafirmagreg-team/translate/lib/url';
-import { tagPseudoId } from '@terrafirmagreg-team/game/lib/dump/paths';
-import { refId, tagKindOf } from '@terrafirmagreg-team/game/lib/dump/contract/ref';
-import type { TaggedReference } from '@terrafirmagreg-team/game/lib/dump/contract/ref';
+import { tagPseudoId } from '@terrafirmagreg-team/dump/lib/dump/paths';
+import { refId, tagKindOf } from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
+import type { TaggedReference } from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
 import type { Lang } from '@terrafirmagreg-team/translate/types/locale';
 import type { EntryHrefOpts } from '@terrafirmagreg-team/game/types/entry';
 
@@ -11,7 +14,7 @@ export type { EntryHrefOpts } from '@terrafirmagreg-team/game/types/entry';
 const query = encodeQuery;
 
 function recipeHref(
-  dataset: string,
+  dataset: DatasetRef,
   lang: Lang | undefined,
   opts?: {
     type?: string;
@@ -31,14 +34,15 @@ function recipeHref(
     ['tab', opts?.tab],
     ['search', opts?.search],
     ['rpage', opts?.rpage && opts.rpage > 1 ? Math.floor(opts.rpage) : undefined],
+    ['version', dataset.version],
   ]);
-  const base = sectionUrl('recipe', dataset);
+  const base = sectionUrl('recipe', dataset.id);
   const href = q ? `${base}?${q}` : base;
   return lang ? withLang(href, lang) : href;
 }
 
 function recipeStackHref(
-  dataset: string,
+  dataset: DatasetRef,
   lang: Lang | undefined,
   id: string,
   opts?: Pick<EntryHrefOpts, 'tab' | 'search'> & {
@@ -61,7 +65,7 @@ function recipeStackHref(
 }
 
 function questHref(
-  dataset: string,
+  dataset: DatasetRef,
   lang: Lang | undefined,
   opts?: { category?: string; id?: string; item?: string },
 ): string {
@@ -69,32 +73,35 @@ function questHref(
     ['category', opts?.category],
     ['id', opts?.id],
     ['item', opts?.item],
+    ['version', dataset.version],
   ]);
-  const base = sectionUrl('quest', dataset);
+  const base = sectionUrl('quest', dataset.id);
   const href = q ? `${base}?${q}` : base;
   return lang ? withLang(href, lang) : href;
 }
 
 export function guideHref(
-  dataset: string,
+  dataset: DatasetRef,
   lang: Lang | undefined,
   bookId?: string,
   entryId?: string,
   hash?: string,
   categoryId?: string,
 ): string {
+  const { id, version } = dataset;
   const q = query([
     ['book', bookId],
     ['entry', entryId],
     ['cat', entryId ? undefined : categoryId],
+    ['version', version],
   ]);
-  const base = `${sectionUrl('guide', dataset)}${q ? `?${q}` : ''}`;
+  const base = `${sectionUrl('guide', id)}${q ? `?${q}` : ''}`;
   const href = hash ? `${base}#${hash}` : base;
   return lang ? withLang(href, lang) : href;
 }
 
 export function entryHref(
-  dataset: string,
+  dataset: DatasetRef,
   lang: Lang | undefined,
   reference: TaggedReference,
   opts?: EntryHrefOpts,
@@ -146,3 +153,4 @@ export function entryHref(
     }
   }
 }
+

package/src/lib/entry/icon-load.ts

@@ -1,22 +1,24 @@
-import type { AtlasBundle } from '@terrafirmagreg-team/game/lib/dump/assets/atlas/dto';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
+import type { AtlasBundle } from '@terrafirmagreg-team/dump/lib/dump/assets/atlas/dto';
 import {
   clientDumpJson,
   clientRegistryDataFileRel,
   clientTagFileRel,
-} from '@terrafirmagreg-team/game/lib/dump/client/dump';
-import { loadClientModAtlases } from '@terrafirmagreg-team/game/lib/dump/client/atlases';
-import { dumpRelPublicUrl, matchTagIndexKey } from '@terrafirmagreg-team/game/lib/dump/paths';
-import { lookupSpriteInBundle } from '@terrafirmagreg-team/game/lib/dump/assets/atlas/lookup';
-import { asIdTable, asRecord, asString } from '@terrafirmagreg-team/game/lib/dump/contract/read';
-import { asTaggedReference } from '@terrafirmagreg-team/game/lib/dump/contract/ref';
-import { asEntry, matchVariant } from '@terrafirmagreg-team/game/lib/dump/data/registry/parse';
-import type { DumpEntityEntry } from '@terrafirmagreg-team/game/lib/dump/data/registry/dto';
-import { asTag, firstTagItem } from '@terrafirmagreg-team/game/lib/dump/data/tag/parse';
-import type { DumpNbt } from '@terrafirmagreg-team/game/lib/dump/contract/ref';
-import type { DumpTag } from '@terrafirmagreg-team/game/lib/dump/data/tag/dto';
-import { createAsyncCache } from '@terrafirmagreg-team/ui/lib/utils/async-cache';
-
-export type { AtlasBundle } from '@terrafirmagreg-team/game/lib/dump/assets/atlas/dto';
+} from '@terrafirmagreg-team/dump/lib/dump/client/dump';
+import { loadClientModAtlases } from '@terrafirmagreg-team/dump/lib/dump/client/atlases';
+import { dumpRelPublicUrl, matchTagIndexKey } from '@terrafirmagreg-team/dump/lib/dump/paths';
+import { modelPublicUrl } from '@terrafirmagreg-team/dump/lib/dump/assets/urls';
+import { lookupSpriteInBundle } from '@terrafirmagreg-team/dump/lib/dump/assets/atlas/lookup';
+import { asIdTable, asRecord, asString } from '@terrafirmagreg-team/dump/lib/dump/contract/read';
+import { asTaggedReference } from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
+import { asEntry, matchVariant } from '@terrafirmagreg-team/dump/lib/dump/data/registry/parse';
+import type { DumpEntityEntry } from '@terrafirmagreg-team/dump/lib/dump/data/registry/dto';
+import { asTag, firstTagItem } from '@terrafirmagreg-team/dump/lib/dump/data/tag/parse';
+import type { DumpNbt } from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
+import type { DumpTag } from '@terrafirmagreg-team/dump/lib/dump/data/tag/dto';
+import { createDatasetCache } from '@terrafirmagreg-team/dump/lib/dump/reader';
+
+export type { AtlasBundle } from '@terrafirmagreg-team/dump/lib/dump/assets/atlas/dto';
 
 type TagMemberKind = 'item' | 'block' | 'fluid' | 'entity';
 
@@ -28,7 +30,7 @@ const TAG_MEMBER_REGISTRY: Record<TagMemberKind, string> = {
 };
 
 export function fetchAtlases(
-  dataset: string,
+  dataset: DatasetRef,
   modId: string,
 ): Promise<AtlasBundle | null> {
   return loadClientModAtlases(dataset, modId).then((bundle) =>
@@ -36,8 +38,8 @@ export function fetchAtlases(
   );
 }
 
-const fetchTagRecord = createAsyncCache(
-  async (dataset: string, tagId: string, memberKind: TagMemberKind) => {
+const fetchTagRecord = createDatasetCache(
+  async (dataset: DatasetRef, tagId: string, memberKind: TagMemberKind) => {
     const rel = await clientTagFileRel(dataset, tagId);
     const entries = asRecord(await clientDumpJson(dataset, rel, 'high'));
     if (!entries) return undefined;
@@ -53,7 +55,7 @@ const fetchTagRecord = createAsyncCache(
 );
 
 export function fetchTagItem(
-  dataset: string,
+  dataset: DatasetRef,
   tagId: string,
   memberKind: TagMemberKind,
 ): Promise<string | null> {
@@ -71,9 +73,9 @@ const TAG_ICON_SPRITE_KIND: Record<TagMemberKind, 'item' | 'fluid'> = {
   entity: 'item',
 };
 
-const fetchTagMembersList = createAsyncCache(
+const fetchTagMembersList = createDatasetCache(
   async (
-    dataset: string,
+    dataset: DatasetRef,
     tagId: string,
     memberKind: TagMemberKind,
   ): Promise<string[]> => {
@@ -103,15 +105,15 @@ const fetchTagMembersList = createAsyncCache(
 );
 
 export function fetchTagMembers(
-  dataset: string,
+  dataset: DatasetRef,
   tagId: string,
   memberKind: TagMemberKind,
 ): Promise<string[]> {
   return fetchTagMembersList(dataset, tagId, memberKind);
 }
 
-const fetchBlockItem = createAsyncCache(
-  async (dataset: string, blockId: string): Promise<string> => {
+const fetchBlockItem = createDatasetCache(
+  async (dataset: DatasetRef, blockId: string): Promise<string> => {
     const ns = blockId.split(':', 1)[0];
     const rel = ns
       ? await clientRegistryDataFileRel(dataset, ns, 'blocks')
@@ -126,13 +128,13 @@ const fetchBlockItem = createAsyncCache(
 );
 
 export function blockItemId(
-  dataset: string,
+  dataset: DatasetRef,
   blockId: string,
 ): Promise<string> {
   return fetchBlockItem(dataset, blockId);
 }
 
-const fetchEntity = createAsyncCache(async (dataset: string, id: string) => {
+const fetchEntity = createDatasetCache(async (dataset: DatasetRef, id: string) => {
   const ns = id.split(':', 1)[0];
   const rel = ns
     ? await clientRegistryDataFileRel(dataset, ns, 'entities')
@@ -147,7 +149,7 @@ const fetchEntity = createAsyncCache(async (dataset: string, id: string) => {
 });
 
 export async function fetchEntityTexture(
-  dataset: string,
+  dataset: DatasetRef,
   id: string,
   nbt?: DumpNbt,
 ): Promise<string | null> {
@@ -156,7 +158,7 @@ export async function fetchEntityTexture(
 }
 
 export function peekEntityTexture(
-  dataset: string,
+  dataset: DatasetRef,
   id: string,
   nbt?: DumpNbt,
 ): string | null | undefined {
@@ -166,8 +168,41 @@ export function peekEntityTexture(
     : entityTextureUrl(dataset, entity, id, nbt);
 }
 
+export async function fetchEntityModel(
+  dataset: DatasetRef,
+  id: string,
+  nbt?: DumpNbt,
+): Promise<string | null> {
+  const entity = await fetchEntity(dataset, id);
+  return entityModelUrl(dataset, entity, id, nbt);
+}
+
+export function peekEntityModel(
+  dataset: DatasetRef,
+  id: string,
+  nbt?: DumpNbt,
+): string | null | undefined {
+  const entity = fetchEntity.peek(dataset, id);
+  return entity === undefined
+    ? undefined
+    : entityModelUrl(dataset, entity, id, nbt);
+}
+
+function entityModelUrl(
+  dataset: DatasetRef,
+  entity: DumpEntityEntry | undefined,
+  id: string,
+  nbt?: DumpNbt,
+): string | null {
+  if (!entity) return null;
+  const model = matchVariant(entity.variants, nbt)?.model ?? entity.model;
+  if (!model) return null;
+  const ns = id.split(':', 1)[0];
+  return modelPublicUrl(dataset, ns, model) ?? null;
+}
+
 export function peekTagMembers(
-  dataset: string,
+  dataset: DatasetRef,
   tagId: string,
   memberKind: TagMemberKind,
 ): string[] | undefined {
@@ -175,14 +210,14 @@ export function peekTagMembers(
 }
 
 export function peekBlockItem(
-  dataset: string,
+  dataset: DatasetRef,
   blockId: string,
 ): string | undefined {
   return fetchBlockItem.peek(dataset, blockId);
 }
 
 function entityTextureUrl(
-  dataset: string,
+  dataset: DatasetRef,
   entity: DumpEntityEntry | undefined,
   id: string,
   nbt?: DumpNbt,
@@ -193,3 +228,4 @@ function entityTextureUrl(
   const ns = id.split(':', 1)[0];
   return dumpRelPublicUrl(dataset, `assets/${ns}/${texture}`) ?? null;
 }
+

package/src/lib/entry/icon.ts

@@ -1,5 +1,5 @@
-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';
 
 export function stackKindOf(
   kind: ReferenceKind | undefined,
@@ -8,3 +8,4 @@ export function stackKindOf(
   const member = tagKindOf(kind);
   return member === 'entity' ? undefined : member;
 }
+

package/src/lib/entry/tooltip.ts

@@ -1,17 +1,18 @@
-import { displayOf } from '@terrafirmagreg-team/game/lib/dump/data/registry/parse';
-import { parseStackId } from '@terrafirmagreg-team/game/lib/dump/contract/ref';
-import { clientDumpLang } from '@terrafirmagreg-team/game/lib/dump/client/dump';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
+import { displayOf } from '@terrafirmagreg-team/dump/lib/dump/data/registry/parse';
+import { parseStackId } from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
+import { clientDumpLang } from '@terrafirmagreg-team/dump/lib/dump/client/dump';
 import {
   clientRegistryKindFor,
   loadClientRegistry,
-} from '@terrafirmagreg-team/game/lib/dump/client/registry';
-import type { DumpDisplay } from '@terrafirmagreg-team/game/lib/dump/contract/text';
-import { dumpTextLines } from '@terrafirmagreg-team/game/lib/dump/assets/lang/names';
-import { createAsyncCache } from '@terrafirmagreg-team/ui/lib/utils/async-cache';
+} from '@terrafirmagreg-team/dump/lib/dump/client/registry';
+import type { DumpDisplay } from '@terrafirmagreg-team/dump/lib/dump/contract/text';
+import { dumpTextLines } from '@terrafirmagreg-team/dump/lib/dump/assets/lang/names';
+import { createDatasetCache } from '@terrafirmagreg-team/dump/lib/dump/reader';
 
-export const loadStackDisplay = createAsyncCache(
+export const loadStackDisplay = createDatasetCache(
   async (
-    dataset: string,
+    dataset: DatasetRef,
     compactId: string,
     kind?: 'item' | 'fluid' | 'entity',
   ): Promise<DumpDisplay | undefined> => {
@@ -38,7 +39,7 @@ type StackTooltip = {
 };
 
 export async function stackTooltip(
-  dataset: string,
+  dataset: DatasetRef,
   id: string,
   lang: string | undefined,
   langMap: Record<string, string> | undefined,
@@ -58,3 +59,4 @@ export async function stackTooltip(
     mods,
   };
 }
+

package/src/lib/preview.ts

@@ -1,12 +1,13 @@
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 import {
   stackIdFromRef,
   type TaggedReference,
-} from '@terrafirmagreg-team/game/lib/dump/contract/ref';
+} from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
 import type { PreviewIcon } from '@terrafirmagreg-team/ui/types/preview';
 
 export function entryPreviewIcon(
   ref: TaggedReference | undefined,
-  dataset: string,
+  dataset: DatasetRef,
 ): PreviewIcon | undefined {
   if (!ref) return undefined;
   return {
@@ -16,3 +17,4 @@ export function entryPreviewIcon(
     dataset,
   };
 }
+

package/src/lib/search.ts

@@ -1,31 +1,30 @@
 import { staticClient } from 'fumadocs-core/search/client/orama-static';
-import { parseDatasetRef } from '@terrafirmagreg-team/kit/lib/location';
-import type { SearchClientSourceCtx } from '@terrafirmagreg-team/kit/lib/search/sources';
-import { loadClientVersions } from './dump/client/dump';
-import { dumpStorageUrl } from './dump/paths';
+import type { SearchClientSourceCtx } from '@terrafirmagreg-team/search/lib/sources';
+import { loadClientVersions } from '@terrafirmagreg-team/dump/lib/dump/client/dump';
+import { dumpStorageUrl } from '@terrafirmagreg-team/dump/lib/dump/paths';
 
 export function dumpSearchClientSource({ refs, locale, tag }: SearchClientSourceCtx) {
   return {
-    deps: [refs.join(','), locale, String(tag)],
+    deps: [JSON.stringify(refs.map(({ id, version }) => [id, version])), locale, String(tag)],
     async search(query: string) {
-      const clients = await Promise.all(
-        refs.map(async (ref) => {
-          const { id, version } = parseDatasetRef(ref);
+      const lists = await Promise.all(
+        refs.map(async ({ id, version }) => {
           const ver = version ?? (await loadClientVersions(id))?.latest;
-          if (!ver) return null;
-          return staticClient({
-            locale,
-            tag,
-            from: dumpStorageUrl(`${id}/${ver}/search.json`),
-          });
+          if (!ver) return [];
+          const run = async (from: string) =>
+            staticClient({ locale, tag, from }).search(query);
+          return run(dumpStorageUrl(`${id}/${ver}/search/${locale}.json`))
+            .catch(() =>
+              run(
+                `/api/search/dump?id=${encodeURIComponent(id)}&ver=${encodeURIComponent(ver)}&lang=${encodeURIComponent(locale)}`,
+              ),
+            )
+            .catch(() => run(dumpStorageUrl(`${id}/${ver}/search.json`)))
+            .catch(() => []);
         }),
       );
-      const lists = await Promise.all(
-        clients.flatMap((client) =>
-          client ? [Promise.resolve(client.search(query)).catch(() => [])] : [],
-        ),
-      );
       return lists.flat();
     },
   };
 }
+

package/src/locales/en_us.json

@@ -1,9 +1,5 @@
 {
-  "ui": {
-    "entry": {
-      "copy": "Copy id",
-      "copy_stack": "Copy stack id",
-      "copy_nbt": "Copy NBT"
-    }
-  }
+  "Copy NBT(ui.entry.copy_nbt)": "Copy NBT",
+  "Copy id(ui.entry.copy)": "Copy id",
+  "Copy stack id(ui.entry.copy_stack)": "Copy stack id"
 }

package/src/locales/ru_ru.json

@@ -1,9 +1,5 @@
 {
-  "ui": {
-    "entry": {
-      "copy": "Копировать id",
-      "copy_stack": "Копировать id стака",
-      "copy_nbt": "Копировать NBT"
-    }
-  }
+  "Copy NBT(ui.entry.copy_nbt)": "Копировать NBT",
+  "Copy id(ui.entry.copy)": "Копировать id",
+  "Copy stack id(ui.entry.copy_stack)": "Копировать id стака"
 }

package/src/locales.ts

@@ -3,3 +3,4 @@ import { createLocaleCatalog } from '@terrafirmagreg-team/translate/lib/locales'
 export const locales = createLocaleCatalog(
   import.meta.glob('./locales/*.json', { eager: true, import: 'default' }),
 );
+

package/src/types/entry.ts

@@ -1,6 +1,7 @@
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 import type { ReactNode } from 'react';
 import type { Lang } from '@terrafirmagreg-team/translate/types/locale';
-import type { DumpNbt, ReferenceKind, TaggedReference } from '@terrafirmagreg-team/game/lib/dump/contract/ref';
+import type { DumpNbt, ReferenceKind, TaggedReference } from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
 
 export type EntrySize = 'sm' | 'md' | 'lg' | 'xl' | number;
 
@@ -21,7 +22,7 @@ export type EntryProps = {
   reference?: TaggedReference;
   kind?: ReferenceKind;
   id?: string;
-  dataset?: string;
+  dataset?: DatasetRef;
 
   name?: string;
 
@@ -47,6 +48,44 @@ export type EntryProps = {
 
   tooltip?: boolean | 'compact' | 'extended' | 'full' | 'adaptive';
   children?: ReactNode;
+
+  icon?: TaggedReference;
+
+  entityView?: 'auto' | 'texture' | 'egg';
 } & Omit<EntryHrefOpts, 'tab'>;
 
 export type KindEntryProps = Omit<EntryProps, 'kind'>;
+
+export type EntryDirectiveProps = Pick<
+  KindEntryProps,
+  | 'id'
+  | 'dataset'
+  | 'name'
+  | 'size'
+  | 'variant'
+  | 'labeled'
+  | 'label'
+  | 'copy'
+  | 'className'
+  | 'missing'
+  | 'tooltip'
+>;
+
+export type BlockDirectiveProps = EntryDirectiveProps &
+  Pick<KindEntryProps, 'href' | 'tab' | 'search'>;
+
+export type ItemDirectiveProps = BlockDirectiveProps;
+export type FluidDirectiveProps = BlockDirectiveProps;
+export type TagDirectiveProps = BlockDirectiveProps;
+export type RecipeDirectiveProps = BlockDirectiveProps;
+
+export type EntityDirectiveProps = EntryDirectiveProps & {
+  view?: 'auto' | 'texture' | 'egg' | 'model';
+};
+
+export type QuestDirectiveProps = EntryDirectiveProps &
+  Pick<KindEntryProps, 'href' | 'filename'>;
+
+export type GuideDirectiveProps = EntryDirectiveProps &
+  Pick<KindEntryProps, 'href' | 'modId' | 'bookPath' | 'entry' | 'hash'>;
+

package/styles/fonts.css

@@ -1,13 +1,29 @@
 @font-face {
   font-family: 'Minecraft';
-  src: url('/fonts/minecraft.otf') format('opentype');
+  src:
+    url('https://cdn.jsdelivr.net/gh/IdreesInc/Minecraft-Font@master/Minecraft.otf')
+      format('opentype'),
+    url('https://cdn.jsdelivr.net/npm/@south-paw/typeface-minecraft@1.0.0/files/minecraft.woff2')
+      format('woff2'),
+    url('https://pub-491e074ddb0942ee9dfa8204a68f07a3.r2.dev/fonts/minecraft.otf')
+      format('opentype');
   font-display: swap;
 }
 
 @font-face {
   font-family: 'Unifont';
-  src: url('/fonts/unifont.otf') format('opentype');
+  src: url('https://edent.gitlab.io/unifont/unifont-12.0.01.woff2')
+    format('woff2');
   font-display: swap;
+  unicode-range: U+0000-FFFF;
+}
+
+@font-face {
+  font-family: 'Unifont';
+  src: url('https://edent.gitlab.io/unifont/unifont_upper-12.0.01.woff2')
+    format('woff2');
+  font-display: swap;
+  unicode-range: U+10000-10FFFF;
 }
 
 .font-mc {

package/src/components/entry/frame.tsx

@@ -1,32 +0,0 @@
-import type { ReactNode } from 'react';
-import { cn } from '@terrafirmagreg-team/ui/lib/utils/cn';
-
-export const ENTRY_CHIP_CLASS =
-  'inline-flex shrink-0 items-center justify-center rounded-sm border border-border bg-secondary p-0.5 hover:bg-accent';
-
-export function EntryFrame({
-  size,
-  chip = false,
-  className,
-  style,
-  children,
-}: {
-  size?: number;
-  chip?: boolean;
-  className?: string;
-  style?: React.CSSProperties;
-  children?: ReactNode;
-}) {
-  return (
-    <span
-      className={cn(
-        'inline-flex shrink-0 items-center justify-center',
-        chip && ENTRY_CHIP_CLASS,
-        className,
-      )}
-      style={{ ...(size ? { width: size, height: size } : undefined), ...style }}
-    >
-      {children}
-    </span>
-  );
-}