Fix tags and authors not showing up on local mods

Fixes #21

Author: krypciak

src/filters.ts

@@ -51,13 +51,13 @@ export function createFuzzyFilteredModList<T extends ModEntry>(filters: Fliters,
                 let mod: ModEntryServer | undefined = origMod.isLocal ? origMod.serverCounterpart : origMod
 
                 let author: number = 0
-                if (mod) {
+                if (mod?.authors) {
                     const res = fuzzysort.go(filters.name!, mod.authors)
                     author = res[0]?.score.map(-1000000, 0, 0, 1000) || 0
                 }
 
                 let tag: number = 0
-                if (mod) {
+                if (mod?.tags) {
                     const res = fuzzysort.go(filters.name!, mod.tags)
                     tag = res[0]?.score.map(-1000000, 0, 0, 1000) || 0
                 }

src/gui/list-entry.ts

@@ -119,8 +119,8 @@ modmanager.gui.ListEntry = ig.FocusGui.extend({
         this.addChildGui(this.nameIconPrefixesText)
 
         if (!isGrid) {
-            if (serverMod?.tags) {
-                const tags = serverMod.tags
+            const tags = serverMod?.tags ?? localMod?.tags
+            if (tags) {
                 const str = tags.map(a => `\\c[0]${a}\\c[0]`).join(', ')
                 this.tags = new sc.TextGui(str, {
                     font: sc.fontsystem.smallFont,
@@ -140,8 +140,8 @@ modmanager.gui.ListEntry = ig.FocusGui.extend({
             this.description.setPos(4 + this.iconOffset, 14)
             this.addChildGui(this.description)
 
-            if (serverMod?.authors) {
-                const authors = serverMod.authors
+            const authors = serverMod?.authors ?? localMod?.authors
+            if (authors && authors.length > 0) {
                 const str = `by ${authors.map(a => `\\c[3]${a}\\c[0]`).join(', ')}`
                 this.authors = new sc.TextGui(str, { font: sc.fontsystem.smallFont, linePadding: -1 })
                 this.addChildGui(this.authors)
@@ -167,7 +167,8 @@ modmanager.gui.ListEntry = ig.FocusGui.extend({
 
             if (serverMod?.stars !== undefined) {
                 this.starCount = new sc.TextGui(`${serverMod.stars}\\i[save-star]`)
-                this.starCount.setPos(496 - this.starCount.hook.size.x, 0)
+                this.starCount.setAlign(ig.GUI_ALIGN_X.RIGHT, ig.GUI_ALIGN_Y.TOP)
+                this.starCount.setPos(53, 0)
                 this.addChildGui(this.starCount)
             }
         }
@@ -238,7 +239,9 @@ modmanager.gui.ListEntry = ig.FocusGui.extend({
                 const spaceLeft =
                     this.hook.size.x -
                     this.authors.hook.pos.x -
-                    (this.hook.size.x - (this.starCount?.hook.pos.x ?? this.versionText.hook.pos.x))
+                    (this.starCount
+                        ? this.starCount.hook.pos.x + this.starCount.hook.size.x
+                        : this.versionText.hook.pos.x + this.versionText.hook.size.x)
                 const freeSpace = spaceLeft - this.authors.hook.size.x
                 if (freeSpace <= 0) {
                     this.authors.setFont(sc.fontsystem.tinyFont)

src/local-mods.ts

@@ -4,6 +4,7 @@ import ModManager from './plugin'
 import { ModEntry, ModEntryLocal, ModEntryServer } from './types'
 import { ModDB } from './moddb'
 import { ModInstaller } from './mod-installer'
+import type { ValidTags } from 'ccmoddb/build/src/types'
 
 type CCL2Mod = {
     baseDirectory: string
@@ -16,6 +17,8 @@ type CCL2Mod = {
     icons?: { '24'?: string }
     repository?: string
     homepage?: string
+    tags?: ValidTags[]
+    authors?: string[] | string
 
     active?: boolean
 }
@@ -166,6 +169,7 @@ export class LocalMods {
     }
 
     private static convertCCL2Mod(mod: CCL2Mod): ModEntryLocal {
+        const authors = mod.authors
         return {
             database: 'LOCAL',
             isLocal: true,
@@ -181,6 +185,8 @@ export class LocalMods {
                 ? mod.baseDirectory.substring(0, mod.baseDirectory.length - 1)
                 : mod.baseDirectory,
             repositoryUrl: mod.repository,
+            authors: authors ? (typeof authors === 'string' ? [authors] : authors) : [],
+            tags: mod.tags ?? [],
 
             active: !mod.disabled,
             iconConfig: mod.icons?.['24']
@@ -197,6 +203,8 @@ export class LocalMods {
     }
 
     private static convertCCL3Mod(mod: Mod): ModEntryLocal {
+        // @ts-expect-error
+        const authors: string[] | string = mod.authors
         const active = mod == modloader._runtimeMod ? true : (sc.options.get(`modEnabled-${mod.id}`) as boolean)
         return {
             database: 'LOCAL',
@@ -214,6 +222,9 @@ export class LocalMods {
             }, {}),
             path: mod.baseDirectory.substring(0, mod.baseDirectory.length - 1),
             repositoryUrl: mod.manifest.repository,
+            authors: authors ? (typeof authors === 'string' ? [authors] : authors) : [],
+            // @ts-expect-error
+            tags: mod.tags ?? [],
 
             active,
             iconConfig: mod.manifest.icons?.['24']

src/types.ts

@@ -53,6 +53,10 @@ interface ModEntryBase extends ModEntryBaseBase {
     awaitingRestart?: boolean
     /** Mod repository web link */
     repositoryUrl?: string
+    /** Author list, may be empty */
+    authors?: string[]
+    /** Mod tag list */
+    tags?: ValidTags[]
 }
 
 export interface ModEntryServer extends ModEntryBase {
@@ -63,14 +67,10 @@ export interface ModEntryServer extends ModEntryBase {
     installation: InstallMethod[]
     /** UNIX timestamp of the last commit of the primary git branch of the repostory provided by "repositoryUrl", fetched by CCModDB */
     lastUpdateTimestamp?: number
-    /** Author list, may be empty */
-    authors: string[]
     /** GitHub star count, local mods have this set if they have a server counterpart */
     stars?: number
     /** Represents the release page info fetched from the mods repository */
     releasePages?: ReleasePage[]
-    /** Mod tag list */
-    tags: ValidTags[]
     /** The testing counterpart */
     testingVersion?: ModEntryServer
     /* Dependency version requirements, cached by the installer */