diff --git a/src/app/App.tsx b/src/app/App.tsx index 72093387..dcfb2a69 100644 --- a/src/app/App.tsx +++ b/src/app/App.tsx @@ -4,7 +4,7 @@ import '../styles/global.css' import '../styles/nodes.css' import { Analytics } from './Analytics.js' import { Header } from './components/index.js' -import { Category, Changelog, Generator, Guide, Guides, Home, Partners, Sounds, Versions } from './pages/index.js' +import { Changelog, Generator, Generators, Guide, Guides, Home, Partners, Sounds, Versions, Worldgen } from './pages/index.js' import { cleanUrl } from './Utils.js' export function App() { @@ -18,14 +18,13 @@ export function App() {
- - - + + - + diff --git a/src/app/Config.ts b/src/app/Config.ts index 7816ba4c..cfc60d8f 100644 --- a/src/app/Config.ts +++ b/src/app/Config.ts @@ -1,27 +1,34 @@ import config from '../config.json' -interface Config { - languages: Array<{ - code: string, - name: string, - schemas?: boolean, - }>, - versions: Array<{ - id: string, - pack_format: number, - ref?: string, - dynamic?: boolean, - }>, - generators: Array<{ - id: string, - url: string, - schema: string, - path?: string, - category?: string, - partner?: string, - minVersion?: string, - maxVersion?: string, - }>, +export interface ConfigLanguage { + code: string, + name: string, + schemas?: boolean, +} + +export interface ConfigVersion { + id: string, + pack_format: number, + ref?: string, + dynamic?: boolean, +} + +export interface ConfigGenerator { + id: string, + url: string, + schema: string, + path?: string, + noPath?: boolean, + tags?: string[], + partner?: string, + minVersion?: string, + maxVersion?: string, +} + +export interface Config { + languages: ConfigLanguage[], + versions: ConfigVersion[], + generators: ConfigGenerator[], } export default config as Config diff --git a/src/app/Store.ts b/src/app/Store.ts index aa69b1e7..975abc2b 100644 --- a/src/app/Store.ts +++ b/src/app/Store.ts @@ -16,6 +16,7 @@ export namespace Store { export const ID_PROJECT_PANEL_OPEN = 'misode_project_panel_open' export const ID_OPEN_PROJECT = 'misode_open_project' export const ID_TREE_VIEW_MODE = 'misode_tree_view_mode' + export const ID_GENERATOR_HISTORY = 'misode_generator_history' export function getLanguage() { return localStorage.getItem(ID_LANGUAGE) ?? 'en' @@ -84,6 +85,10 @@ export namespace Store { return localStorage.getItem(ID_TREE_VIEW_MODE) ?? 'resources' } + export function getGeneratorHistory(): string[] { + return JSON.parse(localStorage.getItem(ID_GENERATOR_HISTORY) ?? '[]') + } + export function setLanguage(language: string | undefined) { if (language) localStorage.setItem(ID_LANGUAGE, language) } @@ -145,4 +150,10 @@ export namespace Store { export function setTreeViewMode(mode: string | undefined) { if (mode) localStorage.setItem(ID_TREE_VIEW_MODE, mode) } + + export function visitGenerator(id: string) { + const history = getGeneratorHistory() + history.push(id) + localStorage.setItem(ID_GENERATOR_HISTORY, JSON.stringify(history.slice(-50))) + } } diff --git a/src/app/components/Badge.tsx b/src/app/components/Badge.tsx new file mode 100644 index 00000000..c70b1db4 --- /dev/null +++ b/src/app/components/Badge.tsx @@ -0,0 +1,15 @@ +import { hashString } from '../Utils.js' +import { Octicon } from './index.js' + +interface Props { + label: string, + active?: boolean, + onClick?: (e: MouseEvent) => unknown, +} +export function Badge({ label, active, onClick }: Props) { + const color = label === 'breaking' ? 5 : hashString(label) % 360 + return
+ {label === 'breaking' && Octicon.alert} + {label} +
+} diff --git a/src/app/components/Card.tsx b/src/app/components/Card.tsx new file mode 100644 index 00000000..13ffc4ac --- /dev/null +++ b/src/app/components/Card.tsx @@ -0,0 +1,21 @@ +import type { ComponentChildren } from 'preact' + +interface Props { + title?: ComponentChildren, + link?: string, + overlay?: ComponentChildren, + children?: ComponentChildren, +} +export function Card({ title, overlay, link, children }: Props) { + const content = <> + {overlay && {overlay}} +
+ {title &&

{title}

} + {children} +
+ + + return link === undefined + ?
{content}
+ : {content} +} diff --git a/src/app/components/GuideCard.tsx b/src/app/components/GuideCard.tsx index ac9e13f8..4eaf0010 100644 --- a/src/app/components/GuideCard.tsx +++ b/src/app/components/GuideCard.tsx @@ -1,25 +1,25 @@ -import { ChangelogTag } from './index.js' +import { useMemo } from 'preact/hooks' +import { getGuide } from '../services/Guides.js' +import { Card } from './Card.jsx' +import { Badge } from './index.js' interface Props { - title: string, - link: string, - versions: string[], - tags: string[], + id: string, activeTags?: string[], toggleTag?: (tag: string) => unknown, } -export function GuideCard({ title, link, versions, tags, activeTags, toggleTag }: Props) { +export function GuideCard({ id, activeTags, toggleTag }: Props) { + const { title, versions, tags } = useMemo(() => getGuide(id), [id]) + const onToggleTag = (tag: string) => (e: MouseEvent) => { if (toggleTag) toggleTag(tag) e.preventDefault() e.stopImmediatePropagation() } - return - {versions.join(' • ')} -

{title}

-
- {tags.sort().map(tag => )} + return +
+ {tags?.sort().map(tag => )}
- + } diff --git a/src/app/components/Header.tsx b/src/app/components/Header.tsx index a325f6f7..fa395515 100644 --- a/src/app/components/Header.tsx +++ b/src/app/components/Header.tsx @@ -26,7 +26,7 @@ export function Header() {

{title}

{gen && {config.generators - .filter(g => g.category === gen?.category && checkVersion(version, g.minVersion)) + .filter(g => g.tags?.[0] === gen?.tags?.[0] && checkVersion(version, g.minVersion)) .map(g => route(cleanUrl(g.url))} /> )} diff --git a/src/app/components/Icons.tsx b/src/app/components/Icons.tsx index eecc5478..23cdfa96 100644 --- a/src/app/components/Icons.tsx +++ b/src/app/components/Icons.tsx @@ -1,5 +1,43 @@ +const TAG = +const STRUCTURE = + export const Icons = { home: , report: , sounds: , + advancement: , + block_definition: , + chat_type: , + dimension: , + dimension_type: , + item_modifier: , + loot_table: , + model: , + pack_mcmeta: , + predicate: , + recipe: , + 'tag/block': TAG, + 'tag/entity_type': TAG, + 'tag/fluid': TAG, + 'tag/game_event': TAG, + 'tag/item': TAG, + 'tag/worldgen/biome': TAG, + text_component: , + world: , + worldgen: , + 'worldgen/biome': , + 'worldgen/configured_carver': , + 'worldgen/configured_feature': , + 'worldgen/configured_structure_feature': STRUCTURE, + 'worldgen/configured_surface_builder': , + 'worldgen/density_function': , + 'worldgen/flat_level_generator_preset': , + 'worldgen/noise': , + 'worldgen/noise_settings': , + 'worldgen/placed_feature': , + 'worldgen/processor_list': , + 'worldgen/structure': STRUCTURE, + 'worldgen/structure_set': , + 'worldgen/template_pool': , + 'worldgen/world_preset': , } diff --git a/src/app/components/Octicon.tsx b/src/app/components/Octicon.tsx index 123b35f1..df0918f9 100644 --- a/src/app/components/Octicon.tsx +++ b/src/app/components/Octicon.tsx @@ -22,6 +22,7 @@ export const Octicon = { file_directory: , file_zip: , gear: , + git_commit: , globe: , heart: , history: , diff --git a/src/app/components/ToolCard.tsx b/src/app/components/ToolCard.tsx index 7e16869c..6b246470 100644 --- a/src/app/components/ToolCard.tsx +++ b/src/app/components/ToolCard.tsx @@ -1,27 +1,32 @@ -import type { ComponentChildren } from 'preact' import { Icons } from './Icons.js' +import { Octicon } from './Octicon.jsx' -type ToolCardProps = { +interface Props { title: string, - desc?: string, - link?: string, + titleIcon?: keyof typeof Octicon | keyof typeof Icons, + link: string, icon?: keyof typeof Icons, - children?: ComponentChildren, + desc?: string, } -export function ToolCard({ title, desc, link, icon, children }: ToolCardProps) { - const content = <> -
+export function ToolCard({ title, desc, link, icon, titleIcon }: Props) { + if (icon || desc) { + return {icon && Icons[icon]}
-

{title}

+

{desc}

-
- {children &&
- {children} -
} - - return link - ? {content} - :
{content}
+ + } + + return + + +} + +function ToolHead({ title, titleIcon }: Pick) { + return

+ {title} + {titleIcon && (titleIcon in Octicon ? (Octicon as any)[titleIcon] : (Icons as any)[titleIcon])} +

} diff --git a/src/app/components/ToolGroup.tsx b/src/app/components/ToolGroup.tsx new file mode 100644 index 00000000..051e5ca1 --- /dev/null +++ b/src/app/components/ToolGroup.tsx @@ -0,0 +1,22 @@ +import type { ComponentChildren } from 'preact' +import type { Icons } from './Icons.jsx' +import type { Octicon } from './Octicon.jsx' +import { ToolCard } from './ToolCard.jsx' + +interface Props { + title: string, + titleIcon?: keyof typeof Octicon | keyof typeof Icons, + link?: string, + children?: ComponentChildren, +} +export function ToolGroup({ title, titleIcon, link, children }: Props) { + return
+ {link === undefined + ?

{title}

+ : + } + {children &&
+ {children} +
} +
+} diff --git a/src/app/components/generator/GeneratorCard.tsx b/src/app/components/generator/GeneratorCard.tsx new file mode 100644 index 00000000..5c113133 --- /dev/null +++ b/src/app/components/generator/GeneratorCard.tsx @@ -0,0 +1,51 @@ +import { useMemo } from 'preact/hooks' +import type { ConfigGenerator } from '../../Config.js' +import config from '../../Config.js' +import { useLocale } from '../../contexts/Locale.jsx' +import type { VersionId } from '../../services/Schemas.js' +import { checkVersion } from '../../services/Schemas.js' +import { cleanUrl } from '../../Utils.js' +import { Badge, Card, Icons, ToolCard } from '../index.js' + +interface Props { + id: string, + minimal?: boolean, +} +export function GeneratorCard({ id, minimal }: Props) { + const { locale } = useLocale() + + const gen = useMemo(() => { + const gen = config.generators.find(g => g.id === id) + if (gen === undefined) { + return { id, schema: id, url: id } + } + return gen + }, [id]) + + const title = locale(gen.partner ? `partner.${gen.partner}.${gen.id}` : gen.id) + + const icon = Object.keys(Icons).includes(id) ? id as keyof typeof Icons : undefined + + if (minimal) { + return + } + + const versions = useMemo(() => { + if (!gen) return [] + return config.versions + .filter(v => checkVersion(v.id, gen.minVersion, gen.maxVersion)) + .map(v => v.id as VersionId) + }, [gen]) + + const tags = useMemo(() => { + if (gen.tags?.includes('assets')) return ['resource-pack'] + return [] + }, [gen]) + + return {title}{icon && Icons[icon]}} overlay={gen.partner ? locale(`partner.${gen.partner}`) : versions.join(' • ')} link={cleanUrl(gen.url)}> + {!gen.noPath &&

/{gen.path ?? gen.id}

} + {tags.length > 0 &&
+ {tags.sort().map(tag => )} +
} + +} diff --git a/src/app/components/generator/GeneratorList.tsx b/src/app/components/generator/GeneratorList.tsx new file mode 100644 index 00000000..bad4a48f --- /dev/null +++ b/src/app/components/generator/GeneratorList.tsx @@ -0,0 +1,54 @@ +import { useMemo, useState } from 'preact/hooks' +import type { ConfigGenerator } from '../../Config.js' +import config from '../../Config.js' +import { useLocale, useVersion } from '../../contexts/index.js' +import { checkVersion } from '../../services/Schemas.js' +import { GeneratorCard, TextInput, VersionSwitcher } from '../index.js' + +interface Props { + path?: string, + predicate?: (gen: ConfigGenerator) => boolean | undefined, +} +export function GeneratorList({ predicate }: Props) { + const { locale } = useLocale() + const { version, changeVersion } = useVersion() + + const [search, setSearch] = useState('') + + const [versionFilter, setVersionFiler] = useState(true) + + const versionedGenerators = useMemo(() => { + return config.generators.filter(gen => { + if (predicate === undefined || !predicate(gen)) return false + if (versionFilter === false) return true + return checkVersion(version, gen.minVersion, gen.maxVersion) + }) + }, [version, versionFilter]) + + const filteredGenerators = useMemo(() => { + const query = search.split(' ').map(q => q.trim().toLowerCase()).filter(q => q.length > 0) + return versionedGenerators.filter(gen => { + const content = `${gen.id} ${gen.tags?.join(' ') ?? ''} ${gen.path ?? ''} ${gen.partner ?? ''} ${locale(gen.id).toLowerCase()}` + return query.every(q => { + if (q.startsWith('!')) { + return q.length === 1 || !content.includes(q.slice(1)) + } + return content.includes(q) + }) + }) + }, [versionedGenerators, search, locale]) + + return
+
+ + {changeVersion(v); setVersionFiler(true)}} hasAny onAny={() => setVersionFiler(false)} /> +
+ {filteredGenerators.length === 0 ? <> + {locale('generators.no_results')} + :
+ {filteredGenerators.map(gen => + + )} +
} +
+} diff --git a/src/app/components/generator/index.ts b/src/app/components/generator/index.ts index bba18e8a..5587369e 100644 --- a/src/app/components/generator/index.ts +++ b/src/app/components/generator/index.ts @@ -1,5 +1,7 @@ export * from './FileCreation.js' export * from './FileRenaming.js' +export * from './GeneratorCard.jsx' +export * from './GeneratorList.jsx' export * from './PreviewPanel.js' export * from './ProjectCreation.js' export * from './ProjectDeletion.js' diff --git a/src/app/components/index.ts b/src/app/components/index.ts index b4e499ab..b202bd81 100644 --- a/src/app/components/index.ts +++ b/src/app/components/index.ts @@ -3,13 +3,14 @@ export * from './Btn.js' export * from './BtnInput.js' export * from './BtnLink.js' export * from './BtnMenu.js' +export * from './Card.jsx' export * from './ErrorPanel.js' export * from './FileUpload.js' export * from './Footer.js' export * from './forms/index.js' export * from './generator/index.js' export * from './Giscus.js' -export * from './GuideCard.js' +export * from './GuideCard.jsx' export * from './Header.js' export * from './Icons.js' export * from './Modal.js' @@ -17,6 +18,7 @@ export * from './Octicon.js' export * from './previews/index.js' export * from './sounds/index.js' export * from './ToolCard.js' +export * from './ToolGroup.jsx' export * from './TreeView.js' export * from './versions/index.js' export * from './VersionSwitcher.js' diff --git a/src/app/components/versions/ChangelogEntry.tsx b/src/app/components/versions/ChangelogEntry.tsx index c02d4808..5537b801 100644 --- a/src/app/components/versions/ChangelogEntry.tsx +++ b/src/app/components/versions/ChangelogEntry.tsx @@ -1,6 +1,7 @@ import { marked } from 'marked' import type { Change } from '../../services/index.js' -import { ChangelogTag } from './index.js' +import { Card } from '../Card.jsx' +import { Badge } from './index.js' type Props = { change: Change, @@ -8,14 +9,13 @@ type Props = { toggleTag?: (tag: string) => unknown, } export function ChangelogEntry({ change, activeTags, toggleTag }: Props) { - return
-
- {change.version} - {change.group} -
-
- {change.tags.map(tag => toggleTag(tag) : undefined} active={activeTags?.includes(tag)} />)} + return + {change.version} + {change.group} + }> +
+ {change.tags.map(tag => toggleTag(tag) : undefined} active={activeTags?.includes(tag)} />)}
-
+ } diff --git a/src/app/components/versions/ChangelogList.tsx b/src/app/components/versions/ChangelogList.tsx index 43d43599..83cf7248 100644 --- a/src/app/components/versions/ChangelogList.tsx +++ b/src/app/components/versions/ChangelogList.tsx @@ -1,18 +1,21 @@ +import type { ComponentChildren } from 'preact' import { useMemo, useState } from 'preact/hooks' import { useLocale } from '../../contexts/index.js' import { useSearchParam, useTags } from '../../hooks/index.js' import type { Change } from '../../services/index.js' +import { Badge } from '../Badge.jsx' import { Btn, TextInput } from '../index.js' import { ChangelogEntry } from './ChangelogEntry.js' -import { ChangelogTag } from './ChangelogTag.js' const SEARCH_KEY = 'search' interface Props { changes: Change[] | undefined, defaultOrder: 'asc' | 'desc', + limit?: number, + navigation?: ComponentChildren, } -export function ChangelogList({ changes, defaultOrder }: Props) { +export function ChangelogList({ changes, defaultOrder, limit, navigation }: Props) { const { locale } = useLocale() const [search, setSearch] = useSearchParam(SEARCH_KEY) @@ -25,7 +28,7 @@ export function ChangelogList({ changes, defaultOrder }: Props) { if (!tags.every(tag => change.tags.includes(tag))) { return false } - const content = change.tags.join(' ') + ' ' + change.content.toLowerCase() + const content = `${change.group} ${change.version} ${change.tags.join(' ')} ${change.content.toLowerCase()}` return query.every(q => { if (q.startsWith('!')) { return q.length === 1 || !content.includes(q.slice(1)) @@ -41,22 +44,35 @@ export function ChangelogList({ changes, defaultOrder }: Props) { return filteredChangelogs?.sort((a, b) => sort ? b.order - a.order : a.order - b.order) }, [filteredChangelogs, sort]) + const [limitActive, setLimitActive] = useState(true) + + const limitedChangelogs = useMemo(() => { + if (!limitActive || (limit ?? -1) < 0) return sortedChangelogs + return sortedChangelogs?.slice(0, limit) + }, [sortedChangelogs, limitActive, limit, sort /* why is this necessary??? */]) + + const hiddenChanges = (sortedChangelogs?.length ?? 0) - (limitedChangelogs?.length ?? 0) + return <> -
- + {navigation} + setSearch(v, true)} /> setSort(!sort)} />
- {tags.length > 0 &&
- {tags.map(tag => toggleTag(tag)} />)} + {tags.length > 0 &&
+ {tags.map(tag => toggleTag(tag)} />)}
} -
- {sortedChangelogs === undefined +
+ {limitedChangelogs === undefined ? {locale('loading')} - : sortedChangelogs.length === 0 + : limitedChangelogs.length === 0 ? {locale('changelog.no_results')} - : sortedChangelogs.map(change => + : limitedChangelogs.map(change => )} + {hiddenChanges > 0 && ( + setLimitActive(false)}/> + )}
} diff --git a/src/app/components/versions/ChangelogTag.tsx b/src/app/components/versions/ChangelogTag.tsx deleted file mode 100644 index cd2abfec..00000000 --- a/src/app/components/versions/ChangelogTag.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { hashString } from '../../Utils.js' -import { Octicon } from '../index.js' - -type TagProps = { - label: string, - active?: boolean, - onClick?: (e: MouseEvent) => unknown, -} -export function ChangelogTag({ label, active, onClick }: TagProps) { - const color = label === 'breaking' ? 5 : hashString(label) % 360 - return
- {label === 'breaking' && Octicon.alert} - {label} -
-} diff --git a/src/app/components/versions/VersionDetail.tsx b/src/app/components/versions/VersionDetail.tsx index d5c8496b..ce65412b 100644 --- a/src/app/components/versions/VersionDetail.tsx +++ b/src/app/components/versions/VersionDetail.tsx @@ -1,7 +1,8 @@ -import { useEffect, useMemo, useState } from 'preact/hooks' +import { useMemo, useState } from 'preact/hooks' import { useLocale } from '../../contexts/index.js' -import type { Change, VersionMeta } from '../../services/index.js' -import { getArticleLink, getChangelogs } from '../../services/index.js' +import { useAsync } from '../../hooks/useAsync.js' +import type { VersionMeta } from '../../services/index.js' +import { fetchChangelogs, getArticleLink } from '../../services/index.js' import { Giscus } from '../Giscus.js' import { Octicon } from '../Octicon.js' import { ChangelogList } from './ChangelogList.js' @@ -18,18 +19,11 @@ export function VersionDetail({ id, version }: Props) { const [tab, setTab] = useState('changelog') - const [changelogs, setChangelogs] = useState(undefined) - useEffect(() => { - getChangelogs() - .then(changelogs => setChangelogs( - changelogs.map(c => ({ ...c, tags: c.tags.filter(t => t !== c.group) })) - )) - .catch(e => console.error(e)) - }, []) + const { value: changes } = useAsync(fetchChangelogs, []) const filteredChangelogs = useMemo(() => - changelogs?.filter(c => c.version === id || c.group === id), - [id, changelogs]) + changes?.filter(c => c.version === id || c.group === id), + [id, changes]) const articleLink = version && getArticleLink(version.id) diff --git a/src/app/components/versions/VersionList.tsx b/src/app/components/versions/VersionList.tsx index fd81425f..a4ab898f 100644 --- a/src/app/components/versions/VersionList.tsx +++ b/src/app/components/versions/VersionList.tsx @@ -1,39 +1,43 @@ -import { useMemo, useState } from 'preact/hooks' +import type { ComponentChildren } from 'preact' +import { useMemo } from 'preact/hooks' import { useLocale } from '../../contexts/index.js' -import { useSearchParam } from '../../hooks/index.js' +import { useLocalStorage, useSearchParam } from '../../hooks/index.js' import type { VersionMeta } from '../../services/index.js' import { Checkbox, TextInput } from '../index.js' import { VersionEntry } from './VersionEntry.js' +const INCLUDE_SNAPSHOTS = 'misode_include_snapshots' const SEARCH_KEY = 'search' interface Props { - versions: VersionMeta[] - link?: (id: string) => string + versions?: VersionMeta[], + link?: (id: string) => string, + navigation?: ComponentChildren, } -export function VersionList({ versions, link }: Props) { +export function VersionList({ versions, link, navigation }: Props) { const { locale } = useLocale() - const [snapshots, setSnapshots] = useState(true) + const [snapshots, setSnapshots] = useLocalStorage(INCLUDE_SNAPSHOTS, true, v => v === 'true', b => `${b}`) const [search, setSearch] = useSearchParam(SEARCH_KEY) - const filteredVersions = useMemo(() => versions.filter(v => { + const filteredVersions = useMemo(() => versions?.filter(v => { if (v.type === 'snapshot' && !snapshots) return false return v.id.includes(search ?? '') }), [versions, snapshots, search]) - return <> -
- + {navigation} +
- {filteredVersions.map(v => )} - {filteredVersions.length === 0 && - {locale('versions.no_results')} - } + {filteredVersions === undefined + ? {locale('loading')} + : filteredVersions.length === 0 + ? {locale('versions.no_results')} + : filteredVersions.map(v => )}
} diff --git a/src/app/components/versions/index.ts b/src/app/components/versions/index.ts index 6735f6b3..22b66a7f 100644 --- a/src/app/components/versions/index.ts +++ b/src/app/components/versions/index.ts @@ -1,6 +1,6 @@ +export * from '../Badge.jsx' export * from './ChangelogEntry.js' export * from './ChangelogList.js' -export * from './ChangelogTag.js' export * from './VersionDetail.js' export * from './VersionEntry.js' export * from './VersionList.js' diff --git a/src/app/hooks/useLocalStorage.ts b/src/app/hooks/useLocalStorage.ts index de60b5d1..b66fb81c 100644 --- a/src/app/hooks/useLocalStorage.ts +++ b/src/app/hooks/useLocalStorage.ts @@ -2,7 +2,7 @@ import { useCallback, useState } from 'preact/hooks' type Result = [T, (value: T | null | undefined) => void] -export function useLocalStorage(key: string, defaultValue: T): Result +export function useLocalStorage(key: string, defaultValue: string): Result export function useLocalStorage(key: string, defaultValue: T, parse: (s: string) => T, stringify: (e: T) => string): Result export function useLocalStorage(key: string, defaultValue: T, parse?: (s: string) => T, stringify?: (e: T) => string): Result { const getter = useCallback(() => { diff --git a/src/app/pages/Category.tsx b/src/app/pages/Category.tsx deleted file mode 100644 index b4d38c60..00000000 --- a/src/app/pages/Category.tsx +++ /dev/null @@ -1,21 +0,0 @@ -import { Footer, ToolCard } from '../components/index.js' -import config from '../Config.js' -import { useLocale, useTitle } from '../contexts/index.js' -import { cleanUrl } from '../Utils.js' - -interface Props { - category: string, - path?: string, -} -export function Category({ category }: Props) { - const { locale } = useLocale() - useTitle(locale('title.generator_category', locale(category))) - return
-
- {config.generators.filter(g => g.category === category).map(g => - - )} -
-
-
-} diff --git a/src/app/pages/Changelog.tsx b/src/app/pages/Changelog.tsx index 9b21d069..a74c4cac 100644 --- a/src/app/pages/Changelog.tsx +++ b/src/app/pages/Changelog.tsx @@ -1,7 +1,7 @@ -import { Ad, ChangelogList, ErrorPanel, Footer } from '../components/index.js' +import { BtnLink, ChangelogList, ErrorPanel, Footer } from '../components/index.js' import { useLocale, useTitle } from '../contexts/index.js' import { useAsync } from '../hooks/index.js' -import { getChangelogs } from '../services/index.js' +import { fetchChangelogs } from '../services/index.js' interface Props { path?: string, @@ -10,13 +10,14 @@ export function Changelog({}: Props) { const { locale } = useLocale() useTitle(locale('title.changelog')) - const { value: changelogs, error } = useAsync(getChangelogs, []) + const { value: changes, error } = useAsync(fetchChangelogs, []) return
- {error && }
- + + )} />
diff --git a/src/app/pages/Generator.tsx b/src/app/pages/Generator.tsx index eaec9c98..36402a28 100644 --- a/src/app/pages/Generator.tsx +++ b/src/app/pages/Generator.tsx @@ -49,6 +49,8 @@ export function Generator({}: Props) { setError(`This generator is not available in versions above ${gen.maxVersion}`) } + useEffect(() => Store.visitGenerator(gen.id), [gen.id]) + const [currentPreset, setCurrentPreset] = useSearchParam('preset') const [sharedSnippetId, setSharedSnippetId] = useSearchParam(SHARE_KEY) const ignoreChange = useRef(false) diff --git a/src/app/pages/Generators.tsx b/src/app/pages/Generators.tsx new file mode 100644 index 00000000..9cf6598d --- /dev/null +++ b/src/app/pages/Generators.tsx @@ -0,0 +1,17 @@ +import { Footer, GeneratorList } from '../components/index.js' +import { useLocale, useTitle } from '../contexts/index.js' + +interface Props { + path?: string +} +export function Generators({}: Props) { + const { locale } = useLocale() + useTitle(locale('title.generators')) + + return
+
+ !gen.partner} /> +
+
+
+} diff --git a/src/app/pages/Guide.tsx b/src/app/pages/Guide.tsx index 991bcbd7..1c01b77e 100644 --- a/src/app/pages/Guide.tsx +++ b/src/app/pages/Guide.tsx @@ -3,7 +3,7 @@ import json from 'highlight.js/lib/languages/json' import { marked } from 'marked' import { route } from 'preact-router' import { useCallback, useEffect, useMemo, useState } from 'preact/hooks' -import { Ad, Btn, ChangelogTag, Footer, Giscus, Octicon, VersionSwitcher } from '../components/index.js' +import { Ad, Badge, Btn, Footer, Giscus, Icons, Octicon, VersionSwitcher } from '../components/index.js' import config from '../Config.js' import { useLocale, useTitle, useVersion } from '../contexts/index.js' import { useActiveTimeout, useAsync, useHash } from '../hooks/index.js' @@ -176,14 +176,19 @@ export function Guide({ id }: Props) {
{Octicon.arrow_left} - {locale('guides.all')} + {locale('guides.all')} + + {Icons.worldgen} + {locale('worldgen')} + +
{allowedVersions && }
- {(frontMatter?.tags && frontMatter.tags.length > 0) &&
+ {(frontMatter?.tags && frontMatter.tags.length > 0) &&
{frontMatter.tags.map((tag: string) => - onClickTag(tag)} /> + onClickTag(tag)} /> )}
} {html && <> diff --git a/src/app/pages/Guides.tsx b/src/app/pages/Guides.tsx index 8d35530d..f0c2db97 100644 --- a/src/app/pages/Guides.tsx +++ b/src/app/pages/Guides.tsx @@ -1,16 +1,8 @@ import { useMemo, useState } from 'preact/hooks' -import { ChangelogTag, Footer, GuideCard, TextInput, VersionSwitcher } from '../components/index.js' +import { Badge, Footer, GuideCard, TextInput, VersionSwitcher } from '../components/index.js' import { useLocale, useTitle, useVersion } from '../contexts/index.js' import { useTags } from '../hooks/index.js' - -interface Guide { - id: string, - title: string, - versions?: string[], - tags?: string[], -} - -declare var __GUIDES__: Guide[] +import { getGuides } from '../services/Guides.js' interface Props { path?: string @@ -26,8 +18,8 @@ export function Guides({}: Props) { const [versionFilter, setVersionFiler] = useState(false) const versionedGuides = useMemo(() => { - if (versionFilter === false) return __GUIDES__ - return __GUIDES__.filter(guide => { + if (versionFilter === false) return getGuides() + return getGuides().filter(guide => { return guide.versions?.includes(version) }) }, [version, versionFilter]) @@ -49,21 +41,23 @@ export function Guides({}: Props) { }, [versionedGuides, search, activeTags]) return
-
-
- +
+
+ {changeVersion(v); setVersionFiler(true)}} hasAny onAny={() => setVersionFiler(false)} />
- {activeTags.length > 0 &&
- {activeTags.map(tag => toggleTag(tag)} />)} + {activeTags.length > 0 &&
+ {activeTags.map(tag => toggleTag(tag)} />)}
} - {versionedGuides.length === 0 ? <> - {locale('guides.no_results.version')} - : filteredGuides.length === 0 ? <> - {locale('guides.no_results.query')} - : filteredGuides.map(g => - - )} +
+ {versionedGuides.length === 0 ? <> + {locale('guides.no_results.version')} + : filteredGuides.length === 0 ? <> + {locale('guides.no_results.query')} + : filteredGuides.map(g => + + )} +
diff --git a/src/app/pages/Home.tsx b/src/app/pages/Home.tsx index 8eeddc30..95d806f7 100644 --- a/src/app/pages/Home.tsx +++ b/src/app/pages/Home.tsx @@ -1,7 +1,12 @@ -import { Footer, Giscus, ToolCard } from '../components/index.js' -import config from '../Config.js' +import { useMemo } from 'preact/hooks' +import { ChangelogEntry, Footer, GeneratorCard, Giscus, GuideCard, ToolCard, ToolGroup } from '../components/index.js' import { useLocale, useTitle } from '../contexts/index.js' -import { cleanUrl } from '../Utils.js' +import { useAsync } from '../hooks/useAsync.js' +import { fetchChangelogs, fetchVersions } from '../services/DataFetcher.js' +import { Store } from '../Store.js' + +const MIN_FAVORITES = 2 +const MAX_FAVORITES = 5 interface Props { path?: string, @@ -9,33 +14,63 @@ interface Props { export function Home({}: Props) { const { locale } = useLocale() useTitle(locale('title.home')) + + const favorites = useMemo(() => { + const history: string[] = [] + for (const id of Store.getGeneratorHistory().reverse()) { + if (!history.includes(id)) { + history.push(id) + } + } + return history.slice(0, MAX_FAVORITES) + }, []) + + const { value: versions } = useAsync(fetchVersions, []) + const release = useMemo(() => versions?.find(v => v.type === 'release'), [versions]) + + const { value: changes } = useAsync(fetchChangelogs, []) + const latestChanges = useMemo(() => changes?.sort((a, b) => b.order - a.order).slice(0, 2), [changes]) + return
-
- - {config.generators.filter(g => !g.category).map(g => - - )} - - - - - {config.generators.filter(g => g.category === 'assets').map(g => - - )} - - - - - - - - +
+
+ + + + + + + + {favorites.length >= MIN_FAVORITES && + {favorites.map(f => )} + } + + + + + + + + + + + {(versions?.[0] && release) && <> + {versions[0].id !== release.id && ( + + )} + + } + + + {latestChanges?.map(change => )} + +
diff --git a/src/app/pages/Partners.tsx b/src/app/pages/Partners.tsx index ea017798..a5e8926a 100644 --- a/src/app/pages/Partners.tsx +++ b/src/app/pages/Partners.tsx @@ -1,15 +1,8 @@ -import { Footer, ToolCard } from '../components/index.js' -import config from '../Config.js' +import { Footer, GeneratorList } from '../components/index.js' import { useLocale, useTitle } from '../contexts/index.js' -import { cleanUrl } from '../Utils.js' - -const partners = [...new Set(config.generators - .filter(g => g.partner !== undefined) - .map(g => g.partner as string) -)] interface Props { - path?: string, + path?: string } export function Partners({}: Props) { const { locale } = useLocale() @@ -17,11 +10,7 @@ export function Partners({}: Props) { return
- {partners.map(p => - {config.generators.filter(g => g.partner === p).map(g => - - )} - )} + gen.partner !== undefined} />
diff --git a/src/app/pages/Versions.tsx b/src/app/pages/Versions.tsx index 47e744dc..374fb730 100644 --- a/src/app/pages/Versions.tsx +++ b/src/app/pages/Versions.tsx @@ -1,4 +1,4 @@ -import { Ad, BtnLink, ErrorPanel, Footer, VersionDetail, VersionList } from '../components/index.js' +import { BtnLink, ErrorPanel, Footer, VersionDetail, VersionList } from '../components/index.js' import { useLocale, useTitle } from '../contexts/index.js' import { useAsync, useSearchParam } from '../hooks/index.js' import type { VersionMeta } from '../services/index.js' @@ -9,7 +9,6 @@ interface Props { } export function Versions({}: Props) { const { locale } = useLocale() - useTitle(locale('title.versions')) const { value: versions, error } = useAsync(fetchVersions, []) @@ -25,7 +24,6 @@ export function Versions({}: Props) { const previousVersion = selected && getOffsetVersion(versions ?? [], selected, 1) return
- {error && }
{selectedId ? <> @@ -37,7 +35,11 @@ export function Versions({}: Props) { icon="arrow_right" label={locale('versions.next')} swapped />
- : `/versions/?id=${id}`} />} + : <> + `/versions/?id=${id}`} navigation={( + + )} /> + }
diff --git a/src/app/pages/Worldgen.tsx b/src/app/pages/Worldgen.tsx new file mode 100644 index 00000000..ea64e3d5 --- /dev/null +++ b/src/app/pages/Worldgen.tsx @@ -0,0 +1,30 @@ +import { Footer, GeneratorCard, GeneratorList, GuideCard, ToolGroup } from '../components/index.js' +import { useLocale, useTitle } from '../contexts/index.js' + +interface Props { + path?: string +} +export function Worldgen({}: Props) { + const { locale } = useLocale() + useTitle(locale('title.worldgen')) + + return
+
+
+ + + + + + + + + + + +
+ gen.tags?.includes('worldgen')} /> +
+
+
+} diff --git a/src/app/pages/index.ts b/src/app/pages/index.ts index ed9bea8f..5ba640f2 100644 --- a/src/app/pages/index.ts +++ b/src/app/pages/index.ts @@ -1,9 +1,10 @@ -export * from './Category.js' export * from './Changelog.js' export * from './Generator.js' +export * from './Generators.jsx' export * from './Guide.js' export * from './Guides.js' export * from './Home.js' export * from './Partners.js' export * from './Sounds.js' export * from './Versions.js' +export * from './Worldgen.jsx' diff --git a/src/app/services/Changelogs.ts b/src/app/services/Article.ts similarity index 54% rename from src/app/services/Changelogs.ts rename to src/app/services/Article.ts index 2607d7d9..76df1ee6 100644 --- a/src/app/services/Changelogs.ts +++ b/src/app/services/Article.ts @@ -1,70 +1,5 @@ -import { isObject } from '../Utils.js' - -const repo = 'https://raw.githubusercontent.com/misode/technical-changes/main' - -export type Change = { - group: string, - version: string, - order: number, - tags: string[], - content: string, -} - -let Changelogs: Change[] | Promise | null = null - -export async function getChangelogs() { - if (!Changelogs) { - const index = await (await fetch(`${repo}/index.json`)).json() as string[] - Changelogs = (await Promise.all( - index.map((group, i) => fetchGroup(parseVersion(group), i)) - )).flat().map(change => ({ - ...change, - tags: [change.group, ...change.tags], - })) - } - return Changelogs -} - -async function fetchGroup(group: string, groupIndex: number) { - const index = await (await fetch(`${repo}/${group}/index.json`)).json() as string[] - return (await Promise.all( - index.map((version, i) => fetchChangelog(group, parseVersion(version), groupIndex, i)) - )).flat() -} - -async function fetchChangelog(group: string, version: string, groupIndex: number, versionIndex: number) { - const text = await (await fetch(`${repo}/${group}/${version}.md`)).text() - return parseChangelog(text).map(change => ({ - version, - group, - order: groupIndex * 1000 + versionIndex, - ...change, - })) -} - -function parseChangelog(text: string) { - return text.split('\n\n') - .map(entry => { - const i = entry.indexOf('|') - return { - tags: entry.substring(0, i).trim().split(' '), - content: entry.slice(i + 1).trim() - .replaceAll('->', '→') - .replaceAll('\n...\n', '\n\n'), - } - }) -} - -function parseVersion(version: unknown): string { - if (typeof version === 'string') { - return version - } else if (isObject(version)) { - return version.id - } - return 'unknown' -} - const ARTICLE_PREFIX = 'https://www.minecraft.net/article/' + const ARTICLE_OVERRIDES = new Map(Object.entries({ '1.16-pre2': 'minecraft-1-16-pre-release-1', '1.16-pre4': 'minecraft-1-16-pre-release-3', diff --git a/src/app/services/DataFetcher.ts b/src/app/services/DataFetcher.ts index d55274d2..a30ee22c 100644 --- a/src/app/services/DataFetcher.ts +++ b/src/app/services/DataFetcher.ts @@ -16,6 +16,7 @@ type Version = { declare var __LATEST_VERSION__: string const latestVersion = __LATEST_VERSION__ ?? '' const mcmetaUrl = 'https://raw.githubusercontent.com/misode/mcmeta' +const changesUrl = 'https://raw.githubusercontent.com/misode/technical-changes' type McmetaTypes = 'summary' | 'data' | 'assets' | 'registries' @@ -52,7 +53,7 @@ export async function fetchData(versionId: string, collectionTarget: CollectionR async function fetchRegistries(version: Version, target: CollectionRegistry) { console.debug(`[fetchRegistries] ${version.id}`) try { - const data = await getData(`${mcmeta(version, 'summary')}/registries/data.min.json`) + const data = await cachedFetch(`${mcmeta(version, 'summary')}/registries/data.min.json`) for (const id in data) { target.register(id, data[id].map((e: string) => 'minecraft:' + e)) } @@ -64,7 +65,7 @@ async function fetchRegistries(version: Version, target: CollectionRegistry) { async function fetchBlockStateMap(version: Version, target: BlockStateRegistry) { console.debug(`[fetchBlockStateMap] ${version.id}`) try { - const data = await getData(`${mcmeta(version, 'summary')}/blocks/data.min.json`) + const data = await cachedFetch(`${mcmeta(version, 'summary')}/blocks/data.min.json`) for (const id in data) { target['minecraft:' + id] = { properties: data[id][0], @@ -99,10 +100,10 @@ export async function fetchAllPresets(versionId: VersionId, registry: string) { const version = config.versions.find(v => v.id === versionId)! await validateCache(version) try { - const entries = await getData(`${mcmeta(version, 'registries')}/${registry}/data.min.json`) + const entries = await cachedFetch(`${mcmeta(version, 'registries')}/${registry}/data.min.json`) return new Map(await Promise.all( entries.map(async (e: string) => - [e, await getData(`${mcmeta(version, 'data')}/data/minecraft/${registry}/${e}.json`)]) + [e, await cachedFetch(`${mcmeta(version, 'data')}/data/minecraft/${registry}/${e}.json`)]) )) } catch (e) { throw new Error(`Error occurred while fetching all ${registry} presets: ${message(e)}`) @@ -119,7 +120,7 @@ export async function fetchSounds(versionId: VersionId): Promise { await validateCache(version) try { const url = `${mcmeta(version, 'summary')}/sounds/data.min.json` - return await getData(url) + return await cachedFetch(url) } catch (e) { throw new Error(`Error occurred while fetching sounds for ${version}: ${message(e)}`) } @@ -148,7 +149,7 @@ export async function fetchVersions(): Promise { const version = config.versions[config.versions.length - 1] await validateCache(version) try { - return getData(`${mcmeta(version, 'summary')}/versions/data.min.json`) + return cachedFetch(`${mcmeta(version, 'summary')}/versions/data.min.json`, { refresh: true }) } catch (e) { throw new Error(`Error occured while fetching versions: ${message(e)}`) } @@ -159,32 +160,84 @@ export function getTextureUrl(versionId: VersionId, path: string): string { return `${mcmeta(version, 'assets')}/assets/minecraft/textures/${path}.png` } -async function getData(url: string, fn: (v: any) => T = (v: any) => v): Promise { +export interface Change { + group: string, + version: string, + order: number, + tags: string[], + content: string, +} + +export async function fetchChangelogs(): Promise { + try { + const [changes, versions] = await Promise.all([ + cachedFetch[]>(`${changesUrl}/generated/changes.json`, { refresh: true }), + fetchVersions(), + ]) + const versionMap = new Map(versions.map((v, i) => [v.id, versions.length - i])) + return changes.map(c => ({ ...c, order: versionMap.get(c.version) ?? 0 })) + } catch (e) { + throw new Error(`Error occured while fetching technical changes: ${message(e)}`) + } +} + +interface FetchOptions { + decode?: (r: Response) => Promise + refresh?: boolean +} + +const REFRESHED = new Set() + +async function cachedFetch(url: string, { decode = (r => r.json()), refresh }: FetchOptions = {}): Promise { try { const cache = await caches.open(CACHE_NAME) - console.debug(`[getData] Opened cache ${CACHE_NAME} ${url}`) + console.debug(`[cachedFetch] Opened cache ${CACHE_NAME} ${url}`) const cacheResponse = await cache.match(url) - - if (cacheResponse && cacheResponse.ok) { - console.debug(`[getData] Retrieving cached data ${url}`) - return await cacheResponse.json() - } - - console.debug(`[getData] fetching data ${url}`) - const fetchResponse = await fetch(url) - const responseData = fn(await fetchResponse.json()) - await cache.put(url, new Response(JSON.stringify(responseData))) - return responseData - } catch (e) { - console.warn(`[getData] Failed to open cache ${CACHE_NAME}: ${message(e)}`) - console.debug(`[getData] fetching data ${url}`) + if (refresh) { + if (REFRESHED.has(url)) { + refresh = false + } else { + REFRESHED.add(url) + } + } + + if (refresh) { + try { + return await fetchAndCache(cache, url, decode) + } catch (e) { + if (cacheResponse && cacheResponse.ok) { + console.debug(`[cachedFetch] Cannot refresh, using cache ${url}`) + return await decode(cacheResponse) + } + throw new Error('Failed to fetch') + } + } else { + if (cacheResponse && cacheResponse.ok) { + console.debug(`[cachedFetch] Retrieving cached data ${url}`) + return await decode(cacheResponse) + } + return await fetchAndCache(cache, url, decode) + } + } catch (e: any) { + console.warn(`[cachedFetch] Failed to open cache ${CACHE_NAME}: ${e.message}`) + + console.debug(`[cachedFetch] Fetching data ${url}`) const fetchResponse = await fetch(url) - const responseData = fn(await fetchResponse.json()) - return responseData + const fetchData = await decode(fetchResponse) + return fetchData } } +async function fetchAndCache(cache: Cache, url: string, decode: (r: Response) => Promise) { + console.debug(`[cachedFetch] Fetching data ${url}`) + const fetchResponse = await fetch(url) + const fetchClone = fetchResponse.clone() + const fetchData = await decode(fetchResponse) + await cache.put(url, fetchClone) + return fetchData +} + async function deleteMatching(matches: (url: string) => boolean) { try { const cache = await caches.open(CACHE_NAME) diff --git a/src/app/services/Guides.ts b/src/app/services/Guides.ts new file mode 100644 index 00000000..4e4b50c9 --- /dev/null +++ b/src/app/services/Guides.ts @@ -0,0 +1,20 @@ +export interface Guide { + id: string, + title: string, + versions?: string[], + tags?: string[], +} + +declare var __GUIDES__: Guide[] + +export function getGuides() { + return __GUIDES__ +} + +export function getGuide(id: string): Guide { + const guide = getGuides().find(g => g.id === id) + if (guide === undefined) { + return { id, title: 'Unknown Guide' } + } + return guide +} diff --git a/src/app/services/index.ts b/src/app/services/index.ts index 22ec077f..f8fb6b8a 100644 --- a/src/app/services/index.ts +++ b/src/app/services/index.ts @@ -1,4 +1,4 @@ -export * from './Changelogs.js' +export * from './Article.js' export * from './DataFetcher.js' export * from './Schemas.js' export * from './Sharing.js' diff --git a/src/config.json b/src/config.json index a97a39b6..67b48f9d 100644 --- a/src/config.json +++ b/src/config.json @@ -122,7 +122,8 @@ { "id": "text_component", "url": "text-component", - "schema": "text_component" + "schema": "text_component", + "noPath": true }, { "id": "chat_type", @@ -139,76 +140,69 @@ "id": "dimension", "url": "dimension", "schema": "dimension", - "category": "worldgen", + "tags": ["worldgen"], "minVersion": "1.16" }, { "id": "dimension_type", "url": "dimension-type", "schema": "dimension_type", - "category": "worldgen", - "minVersion": "1.16" - }, - { - "id": "world", - "url": "world", - "schema": "world_settings", - "category": "worldgen", + "tags": ["worldgen"], "minVersion": "1.16" }, { "id": "worldgen/biome", "url": "worldgen/biome", - "category": "worldgen", + "tags": ["worldgen"], "schema": "biome", "minVersion": "1.16" }, { "id": "worldgen/configured_carver", "url": "worldgen/carver", - "category": "worldgen", + "tags": ["worldgen"], "schema": "configured_carver", "minVersion": "1.16" }, { "id": "worldgen/configured_feature", "url": "worldgen/feature", - "category": "worldgen", + "tags": ["worldgen"], "schema": "configured_feature", "minVersion": "1.16" }, - { - "id": "worldgen/density_function", - "url": "worldgen/density-function", - "category": "worldgen", - "schema": "density_function", - "minVersion": "1.18.2" - }, { "id": "worldgen/placed_feature", "url": "worldgen/placed-feature", - "category": "worldgen", + "tags": ["worldgen"], "schema": "placed_feature", "minVersion": "1.18" }, + { + "id": "worldgen/density_function", + "url": "worldgen/density-function", + "tags": ["worldgen"], + "schema": "density_function", + "minVersion": "1.18.2" + }, { "id": "worldgen/noise", "url": "worldgen/noise", - "category": "worldgen", + "tags": ["worldgen"], "schema": "noise_parameters", "minVersion": "1.18" }, { "id": "worldgen/noise_settings", "url": "worldgen/noise-settings", - "category": "worldgen", + "tags": ["worldgen"], "schema": "noise_settings", "minVersion": "1.16" }, { "id": "worldgen/configured_structure_feature", "url": "worldgen/structure-feature", - "category": "worldgen", + "tags": ["worldgen"], "schema": "configured_structure_feature", "minVersion": "1.16", "maxVersion": "1.18.2" @@ -216,21 +210,21 @@ { "id": "worldgen/structure", "url": "worldgen/structure", - "category": "worldgen", + "tags": ["worldgen"], "schema": "structure", "minVersion": "1.19" }, { "id": "worldgen/structure_set", "url": "worldgen/structure-set", - "category": "worldgen", + "tags": ["worldgen"], "schema": "structure_set", "minVersion": "1.18.2" }, { "id": "worldgen/configured_surface_builder", "url": "worldgen/surface-builder", - "category": "worldgen", + "tags": ["worldgen"], "schema": "configured_surface_builder", "minVersion": "1.16", "maxVersion": "1.17" @@ -238,56 +232,64 @@ { "id": "worldgen/processor_list", "url": "worldgen/processor-list", - "category": "worldgen", + "tags": ["worldgen"], "schema": "processor_list", "minVersion": "1.16" }, { "id": "worldgen/template_pool", "url": "worldgen/template-pool", - "category": "worldgen", + "tags": ["worldgen"], "schema": "template_pool", "minVersion": "1.16" }, { "id": "worldgen/world_preset", "url": "worldgen/world-preset", - "category": "worldgen", + "tags": ["worldgen"], "schema": "world_preset", "minVersion": "1.19" }, { "id": "worldgen/flat_level_generator_preset", "url": "worldgen/flat-world-preset", - "category": "worldgen", + "tags": ["worldgen"], "schema": "flat_level_generator_preset", "minVersion": "1.19" }, + { + "id": "world", + "url": "world", + "schema": "world_settings", + "noPath": true, + "tags": ["worldgen"], + "minVersion": "1.16" + }, { "id": "tag/block", "url": "tags/block", - "category": "tags", + "tags": ["tags"], "path": "tags/blocks", "schema": "block_tag" }, { "id": "tag/entity_type", "url": "tags/entity-type", - "category": "tags", + "tags": ["tags"], "path": "tags/entity_types", "schema": "entity_type_tag" }, { "id": "tag/fluid", "url": "tags/fluid", - "category": "tags", + "tags": ["tags"], "path": "tags/fluids", "schema": "fluid_tag" }, { "id": "tag/game_event", "url": "tags/game-event", - "category": "tags", + "tags": ["tags"], "path": "tags/game_events", "schema": "game_event_tag", "minVersion": "1.17" @@ -295,14 +297,14 @@ { "id": "tag/item", "url": "tags/item", - "category": "tags", + "tags": ["tags"], "path": "tags/items", "schema": "item_tag" }, { "id": "tag/worldgen/biome", "url": "tags/biome", - "category": "tags", + "tags": ["tags", "worldgen"], "path": "tags/worldgen/biome", "schema": "biome_tag", "minVersion": "1.18.2" @@ -311,21 +313,21 @@ "id": "block_definition", "url": "assets/blockstate", "path": "blockstates", - "category": "assets", + "tags": ["assets"], "schema": "block_definition" }, { "id": "model", "url": "assets/model", "path": "models", - "category": "assets", + "tags": ["assets"], "schema": "model" }, { "id": "block_growth", "url": "partners/immersive-weathering/block-growth", "path": "block_growths", - "category": "partners", + "tags": ["partners"], "partner": "immersive_weathering", "schema": "immersive_weathering:block_growth", "minVersion": "1.18.2" diff --git a/src/locales/en.json b/src/locales/en.json index 74abca3d..6813526e 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -7,8 +7,10 @@ "assets": "Assets", "back": "Back", "block_definition": "Blockstate", + "changelog": "Technical changelog", "changelog.search": "Search changes", - "changelog.no_results": "No changes", + "changelog.no_results": "No documented changes", + "changelog.show_more": "Show %0% more changes", "choose_file": "Choose file", "choose_zip_file": "Choose zip file", "chat_type": "Chat Type", @@ -40,7 +42,13 @@ "fields": "Fields", "generate_new_seed": "Generate new seed", "generate_new_uuid": "Generate new UUID", + "generators.all": "All generators", + "generators.popular": "Popular Generators", + "generators.recent": "Recently Used Generators", + "generators.search": "Search generators", + "generators.no_results": "No generators for this query", "github": "GitHub", + "guides": "Guides", "guides.all": "All guides", "guides.search": "Search guides", "guides.no_results.version": "No guides for this version", @@ -101,6 +109,7 @@ "title.changelog": "Technical Changelog", "title.generator": "%0% Generator", "title.generator_category": "%0% Generators", + "title.generators": "Data Pack Generators", "title.guides": "Data Pack Guides", "title.home": "Data Pack Generators", "title.partners": "Partners", @@ -108,6 +117,8 @@ "title.new_project": "Create a new project", "title.sounds": "Sound Explorer", "title.versions": "Versions Explorer", + "title.worldgen": "Worldgen Generators and Guides", + "tools": "Tools", "pack_mcmeta": "Pack.mcmeta", "partner.immersive_weathering": "Immersive Weathering", "partner.immersive_weathering.block_growth": "Block Growth", @@ -187,11 +198,14 @@ "versions.resource_pack_format": "Resource pack format", "versions.technical_changes": "Technical changes", "versions.discussion": "Discussion", + "versions.minecraft_versions": "Minecraft Versions", + "versions.latest_snapshot": "Latest snapshot", + "versions.latest_release": "Latest release", "world": "World Settings", "worldgen": "Worldgen", "worldgen/biome": "Biome", - "worldgen/configured_carver": "Carver", - "worldgen/configured_feature": "Feature", + "worldgen/configured_carver": "Configured Carver", + "worldgen/configured_feature": "Configured Feature", "worldgen/density_function": "Density Function", "worldgen/placed_feature": "Placed Feature", "worldgen/noise": "Noise", diff --git a/src/styles/global.css b/src/styles/global.css index 3a23fa18..6c5cdf5d 100644 --- a/src/styles/global.css +++ b/src/styles/global.css @@ -218,9 +218,11 @@ nav li.dimmed:hover svg { } nav li > *, -nav li svg { +nav li svg, +nav li .btn svg { width: 24px; height: 24px; + fill: inherit; } .title .btn-menu { @@ -319,8 +321,7 @@ main > .controls { .sounds-controls > *:not(:last-child), .preview-controls > *:not(:last-child), .generator-controls > *:not(:last-child), -.project-controls > *:not(:last-child), -.versions-controls > *:not(:last-child) { +.project-controls > *:not(:last-child) { margin-right: 8px; } @@ -569,6 +570,9 @@ main.has-project { .btn svg { flex-shrink: 0; + width: 16px; + height: 16px; + fill: currentColor; } .btn svg:not(:last-child) { @@ -999,56 +1003,58 @@ main.has-project { margin: 0 auto; } -.home { +.worldgen { display: grid; - grid-template-columns: 1fr 1fr; - gap: 0 8px; - align-items: flex-start; - grid-template-rows: min-content 1fr repeat(6, auto); -} - -.home > *:first-child { - grid-row: 1 / 3; -} - -.home > *:nth-child(n+4) { - grid-column: 1 / 3; -} - -h2 { - font-size: 24px; - font-weight: unset; + gap: 16px; } .tool-card { display: flex; - flex-direction: column; - margin-bottom: 8px; + padding: 10px; color: var(--text-2); background-color: var(--background-2); - box-shadow: 1px 1px 7px -3px #000; border-radius: 6px; text-decoration: none; } -a.tool-card:hover { +a.tool-card:hover, +a.tool-head:hover { background-color: var(--background-3); } -.tool-head { +.tool-group { display: flex; - padding: 10px; + flex-direction: column; + color: var(--text-2); + background-color: var(--background-2); + box-shadow: 1px 1px 7px -3px #000; + border-radius: 6px; } -.tool-head svg { +.tool-card svg { width: 32px; height: 32px; flex-shrink: 0; margin-right: 8px; } -.tool-head h3 { +.tool-card h3 { + display: flex; font-weight: unset; + align-items: center; +} + +.tool-card h3 svg { + color: var(--text-2); + fill: currentColor; + width: 20px; + height: 20px; + margin-left: 8px; + transition: margin 0.2s; +} + +.tool-card:hover h3 > svg { + margin-left: 14px; } .tool-head p { @@ -1524,20 +1530,11 @@ hr { padding: 16px; } -.changelog-entry { - background: var(--background-2); - border-radius: 4px; - margin-bottom: 8px; - padding: 8px; - color: var(--text-2); +.changelog > .badges-list { + margin-top: 12px; } -.changelog-tags { - display: flex; - flex-wrap: wrap; -} - -.changelog-tag { +.badge { --color: hsl(var(--tint, 0), var(--text-saturation), var(--text-lightness)); display: flex; align-items: center; @@ -1555,43 +1552,40 @@ hr { -ms-user-select: none; } -.changelog-entry .changelog-tag { - margin-bottom: 8px; -} - -.changelog-tag svg { +.badge svg { margin-right: 4px; width: 20px; height: 20px; } -.changelog-tag.clickable { +.badge.clickable { cursor: pointer; } -.changelog-tag.active { +.badge.active { background-color: var(--color); color: var(--background-2); fill: var(--background-2); } -.changelog-version { - float: right; +.badges-list { + display: flex; + flex-wrap: wrap; } -.changelog-version > * { +.changelog-version { margin-left: auto; font-size: 15px; color: var(--text-3); text-decoration: none; } -.changelog-version > *:first-child { +.changelog-version:not(:last-child) { position: relative; margin-right: 19px; } -.changelog-version > *:first-child::after { +.changelog-version:not(:last-child)::after { content: '•'; position: absolute; text-decoration: none; @@ -1600,7 +1594,7 @@ hr { pointer-events: none; } -.changelog-version a:hover { +.changelog-version:hover { text-decoration: underline; } @@ -1612,41 +1606,18 @@ hr { padding-left: 24px; } -.changelog-entry code { +.changelog-content code { background-color: var(--background-5); padding: 1px 4px; border-radius: 4px; color: var(--text-1); } -.changelog-query { - display: flex; - margin-bottom: 8px; -} - -.changelog-query > *:not(:first-child) { - margin-left: 8px; -} - -.changelog-search { +.query-search { flex-basis: 100%; background-color: var(--background-2); } -.changelog-tags { - margin-bottom: 8px; -} - -.versions-controls { - display: flex; - padding-bottom: 16px; -} - -.version-search { - min-width: 0px; - background-color: var(--background-2); -} - .checkbox { display: flex; align-items: center; @@ -1654,6 +1625,7 @@ hr { border-radius: 6px; height: 32px; font-size: 1rem; + white-space: nowrap; color: var(--text-2); background-color: var(--background-2); box-shadow: 0 1px 7px -2px #000; @@ -1667,11 +1639,8 @@ hr { margin-right: 8px; } -.versions-controls .checkbox { - white-space: nowrap; -} - .version-list { + margin-top: 16px; display: flex; flex-direction: column; } @@ -1709,10 +1678,29 @@ hr { margin-right: 8px; } +.navigation-divider { + flex-basis: 100%; +} + +.result-list { + margin-top: 8px; + display: flex; + flex-direction: column; +} + +.result-list > *:not(:last-child) { + margin-bottom: 8px; +} + .version-detail { color: var(--text-3); } +.version-detail h2 { + font-size: 24px; + font-weight: unset; +} + .version-detail h2, .version-detail h3, .version-detail h4 { @@ -1821,7 +1809,14 @@ hr { min-height: 325.667px; } -.guide-card { +.card-group { + display: grid; + grid-template-columns: 1fr 1fr; + gap: 8px; + align-items: flex-start; +} + +.card { display: block; text-decoration: none; color: var(--text-2); @@ -1830,22 +1825,58 @@ hr { border-radius: 6px; } -.guide-card:not(:last-child) { - margin-bottom: 8px; +.card:hover { + background-color: var(--background-3); } -.guide-versions { +.card-content { + display: flex; + flex-direction: column; +} + +.card-content > *:not(:last-child) { + margin-bottom: 12px; +} + +.card-title { + display: flex; + align-items: center; +} + +.card-title svg { + width: 20px; + height: 20px; + color: var(--text-2); + fill: currentColor; + margin-left: 8px; + transition: margin 0.2s; +} + +.card:hover .card-title svg { + margin-left: 14px; +} + +.card-overlay { color: var(--text-3); float: right; } +.card-subtitle { + overflow: hidden; + text-overflow: ellipsis; +} + +.guides > .badges-list { + margin-top: 8px; +} + .guide { padding-left: 32px; padding-right: 32px; } -.guide .navigation > :first-child { - margin-right: auto; +.guide > .badges-list { + margin-top: 12px; } .guide-share.active { @@ -1853,12 +1884,6 @@ hr { color: var(--text-2); } -.guide-tags { - margin-top: 12px; - display: flex; - flex-wrap: wrap; -} - .guide .ad { margin: 12px 0 8px; } @@ -1897,6 +1922,7 @@ hr { .guide-content h6 { margin: 1.2em 0 0.4em; position: relative; + font-weight: normal; } .guide-content h1 > [id], @@ -1932,6 +1958,10 @@ hr { opacity: 1; } +.guide-content h2 { + font-size: 24px; +} + .guide-content blockquote { border-left: 4px solid var(--background-6); color: var(--text-3); @@ -2101,13 +2131,8 @@ hr { /* SMALL */ @media screen and (max-width: 580px) { - .home { + .card-group { grid-template-columns: 1fr; - gap: 0; - } - - .home > * { - grid-column: 1 / 2; } .title h1 { @@ -2164,7 +2189,7 @@ hr { display: none; } - .guide-versions { + .card-overlay { display: none; } }