mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-23 00:13:13 +09:00
Distinguish simple and layered icons
This allows the type to be automatically inferred and removes the need for type casts.
This commit is contained in:
1 parent
bbd3cc7fdb
commit
bcabad567e
1 file changed
+5
-4
@@ -14,6 +14,7 @@ interface Prototype {
|
|||||||
name: string,
|
name: string,
|
||||||
}
|
}
|
||||||
interface SimpleIconSpecification {
|
interface SimpleIconSpecification {
|
||||||
|
icons?: never;
|
||||||
icon: string;
|
icon: string;
|
||||||
icon_size?: number;
|
icon_size?: number;
|
||||||
icon_mipmaps?: number;
|
icon_mipmaps?: number;
|
||||||
@@ -261,9 +262,9 @@ function fixIcons(item: ItemPrototype) {
|
|||||||
/** Get the primary icon path from a prototype (first layer for layered, .icon for simple). */
|
/** Get the primary icon path from a prototype (first layer for layered, .icon for simple). */
|
||||||
function getPrimaryIconPath(item: ItemPrototype): string | undefined {
|
function getPrimaryIconPath(item: ItemPrototype): string | undefined {
|
||||||
if (item.icons) {
|
if (item.icons) {
|
||||||
return (item as LayeredIconSpecification).icons[0]?.icon;
|
return item.icons[0]?.icon;
|
||||||
}
|
}
|
||||||
return (item as SimpleIconSpecification).icon;
|
return item.icon;
|
||||||
}
|
}
|
||||||
|
|
||||||
const itemTypes = new Set([
|
const itemTypes = new Set([
|
||||||
@@ -394,7 +395,7 @@ async function exportItems(
|
|||||||
let iconPos: number | undefined;
|
let iconPos: number | undefined;
|
||||||
if (item.icons) {
|
if (item.icons) {
|
||||||
icon = await loadLayeredIcon(
|
icon = await loadLayeredIcon(
|
||||||
server, modVersions, item as LayeredIconSpecification, SHEET_ICON_SIZE, state.iconCache,
|
server, modVersions, item, SHEET_ICON_SIZE, state.iconCache,
|
||||||
);
|
);
|
||||||
iconPos = state.pos;
|
iconPos = state.pos;
|
||||||
|
|
||||||
@@ -402,7 +403,7 @@ async function exportItems(
|
|||||||
iconPos = state.simpleIcons.get(item.icon as string);
|
iconPos = state.simpleIcons.get(item.icon as string);
|
||||||
if (iconPos === undefined) {
|
if (iconPos === undefined) {
|
||||||
icon = await loadSimpleIcon(
|
icon = await loadSimpleIcon(
|
||||||
server, modVersions, item as SimpleIconSpecification, SHEET_ICON_SIZE, state.iconCache,
|
server, modVersions, item, SHEET_ICON_SIZE, state.iconCache,
|
||||||
);
|
);
|
||||||
if (icon) {
|
if (icon) {
|
||||||
iconPos = state.pos;
|
iconPos = state.pos;
|
||||||
|
|||||||
Reference in new issue
Block a user