From cbdf81d969bfd0544604f03fe6c99571a22f6ebf Mon Sep 17 00:00:00 2001 From: Misode Date: Wed, 14 Dec 2022 00:25:20 +0100 Subject: [PATCH] Show weight of loot entries when collapsed --- src/app/schema/renderHtml.tsx | 13 ++++++++++--- src/locales/en.json | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/app/schema/renderHtml.tsx b/src/app/schema/renderHtml.tsx index 2488b7a5..f3bd1b6d 100644 --- a/src/app/schema/renderHtml.tsx +++ b/src/app/schema/renderHtml.tsx @@ -7,7 +7,7 @@ import { useState } from 'preact/hooks' import { Btn, Octicon } from '../components/index.js' import { ItemDisplay } from '../components/ItemDisplay.jsx' import config from '../Config.js' -import { localize, useStore } from '../contexts/index.js' +import { localize, useLocale, useStore } from '../contexts/index.js' import { useFocus } from '../hooks/index.js' import { VanillaColors } from '../previews/index.js' import type { BlockStateRegistry, VersionId } from '../services/index.js' @@ -319,13 +319,20 @@ const renderHtml: RenderHook = { } function Collapsed({ path, value }: { path: ModelPath, value: any, schema: INode }) { + const { locale } = useLocale() const context = path.getContext().join('.') switch (context) { case 'loot_table.pools.entry': - return + const count = value?.entries?.length ?? 0 + return case 'function.set_contents.entries.entry': case 'loot_pool.entries.entry': - return + const name = value?.name?.replace(/^minecraft:/, '') ?? value?.type?.replace(/^minecraft:/, '') + const weight = value?.weight || undefined + return <> + + {weight !== undefined && } + } for (const child of Object.values(value ?? {})) { if (typeof child === 'string') { diff --git a/src/locales/en.json b/src/locales/en.json index 7dc0d3a5..6e90921f 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -214,6 +214,7 @@ "versions.minecraft_versions": "Minecraft Versions", "versions.latest_snapshot": "Latest snapshot", "versions.latest_release": "Latest release", + "weight": "Weight", "world": "World Settings", "worldgen": "Worldgen", "worldgen/biome": "Biome",