aperx/factorio-clusterio
1
0 Fork 0
mirror of https://github.com/clusterio/clusterio.git synced 2026-11-14 07:24:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

Distinguish simple and layered icons

Browse Source 
This allows the type to be automatically inferred and removes the need
for type casts.
This commit is contained in:
Hornwitser committed 2026-03-12 14:45:48 +01:00
1 parent bbd3cc7fdb
commit bcabad567e
1 file changed
+5 -4
Download Patch File Download Diff File Expand all files Collapse all files
packages/host/src/export.ts
+5 -4
View File
@@ -14,6 +14,7 @@ interface Prototype {
name: string,
}
interface SimpleIconSpecification {
icons?: never;
icon: string;
icon_size?: 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). */
function getPrimaryIconPath(item: ItemPrototype): string | undefined {
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([
@@ -394,7 +395,7 @@ async function exportItems(
let iconPos: number | undefined;
if (item.icons) {
icon = await loadLayeredIcon(
server, modVersions, item as LayeredIconSpecification, SHEET_ICON_SIZE, state.iconCache,
server, modVersions, item, SHEET_ICON_SIZE, state.iconCache,
);
iconPos = state.pos;
@@ -402,7 +403,7 @@ async function exportItems(
iconPos = state.simpleIcons.get(item.icon as string);
if (iconPos === undefined) {
icon = await loadSimpleIcon(
server, modVersions, item as SimpleIconSpecification, SHEET_ICON_SIZE, state.iconCache,
server, modVersions, item, SHEET_ICON_SIZE, state.iconCache,
);
if (icon) {
iconPos = state.pos;