fix: restore cyclops-infobook-html dep, add workspace for generate-icons, fix game_launching timeout

Co-authored-by: rubensworks <440384+rubensworks@users.noreply.github.com>

Author: Copilot

.github/workflows/deploy.yml

@@ -8,11 +8,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - name: Checkout Infobook-html 📚
-        uses: actions/checkout@v4
-        with:
-          repository: CyclopsMC/Infobook-html
-          path: infobook-html
       - name: Setup Java ☕
         uses: actions/setup-java@v4
         with:
@@ -31,27 +26,9 @@ jobs:
           key: minecraft-${{ hashFiles('modpack.json') }}
           restore-keys: |
             minecraft-
-      - name: Apply icon generation script to Infobook-html 🔧
-        run: |
-          cp infobook-html-additions/bin/generate-icons.ts infobook-html/bin/generate-icons.ts
-          cp infobook-html-additions/lib/modloader/IconsGenerator.ts infobook-html/lib/modloader/IconsGenerator.ts
-          mkdir -p infobook-html/test/modloader
-          cp infobook-html-additions/test/modloader/IconsGenerator-test.ts infobook-html/test/modloader/IconsGenerator-test.ts
-          jq '.bin["generate-icons"] = "bin/generate-icons.js"' infobook-html/package.json > /tmp/pkg-patched.json
-          mv /tmp/pkg-patched.json infobook-html/package.json
-          jq '.compilerOptions.skipLibCheck = true' infobook-html/tsconfig.json > /tmp/tsconfig-patched.json
-          mv /tmp/tsconfig-patched.json infobook-html/tsconfig.json
-          sed -i 's/\.map(() => \[\])/\.map((): any[] => [])/' infobook-html/lib/infobook/appendix/InfoBookAppendixHandlerCraftingRecipe.ts
-      - name: Build and link Infobook-html 🔗
-        run: |
-          cd infobook-html
-          npm install --legacy-peer-deps --ignore-scripts
-          npm run build
-          npm link
       - name: Install and Build 🔧
         run: |
-          npm install --legacy-peer-deps --ignore-scripts
-          npm link cyclops-infobook-html --legacy-peer-deps
+          npm install --legacy-peer-deps
           npm run build
           npm run lint
       - name: Download mods and generate metadata 📦
@@ -69,3 +46,4 @@ jobs:
           BRANCH: gh-pages
           FOLDER: output
           CLEAN: true
+

.gitignore

@@ -10,3 +10,4 @@ mod_assets
 registries
 icons
 headlessmc
+HeadlessMC

infobook-html-additions/lib/modloader/IconsGenerator.ts

@@ -257,6 +257,15 @@ export class IconsGenerator {
                 sendCommand('gui');
                 transitionTo('checking_screen');
               }, 5000);
+            } else if (Date.now() - stateSettledAt > 300000 && !commandSent) {
+              // 5-minute timeout: if game output is not being relayed to HMC stdout
+              // (e.g. HMCLog4JAppender terminal is null), proceed assuming game is loaded
+              commandSent = true;
+              process.stdout.write('[HMC] Game load detection timeout, proceeding assuming game is loaded...\n');
+              setTimeout(() => {
+                sendCommand('gui');
+                transitionTo('checking_screen');
+              }, 5000);
             }
             break;
 
@@ -424,6 +433,7 @@ export class IconsGenerator {
     return output.includes('Mod loading complete') ||
       output.includes('[minecraft/Minecraft]: Loaded 0 advancements') ||
       output.includes('HMC Specifics initialized') ||
+      output.includes('HMC-Specifics initialized') ||
       (output.includes('[Render thread/INFO]') && output.includes('Loaded '));
   }
 

infobook-html-additions/package.json

@@ -0,0 +1,21 @@
+{
+  "name": "cyclops-infobook-html-additions",
+  "version": "1.0.0",
+  "private": true,
+  "description": "Icon generation additions for cyclops-infobook-html",
+  "bin": {
+    "generate-icons": "bin/generate-icons.js"
+  },
+  "scripts": {
+    "build": "tsc",
+    "prepare": "npm run build"
+  },
+  "dependencies": {
+    "@types/minimist": "^1.2.0",
+    "@types/node": "^13.1.0",
+    "@types/node-fetch": "^2.5.0",
+    "minimist": "^1.2.0",
+    "node-fetch": "^2.6.0",
+    "typescript": "^5.0.0"
+  }
+}

infobook-html-additions/test/modloader/IconsGenerator-test.ts

@@ -205,6 +205,10 @@ describe('IconsGenerator', () => {
       expect(generator.isGameFullyLoaded('[INFO] HMC Specifics initialized')).toBe(true);
     });
 
+    it('should return true when HMC-Specifics initialized (with hyphen, actual log format)', () => {
+      expect(generator.isGameFullyLoaded('[Render thread/INFO] [me.earth.headlessmc.mc.Initializer/]: HMC-Specifics initialized!')).toBe(true);
+    });
+
     it('should return true when Minecraft advancements message is present', () => {
       expect(generator.isGameFullyLoaded(
         '[Render thread/INFO] [minecraft/Minecraft]: Loaded 0 advancements'

infobook-html-additions/tsconfig.json

@@ -0,0 +1,26 @@
+{
+  "compileOnSave": true,
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "dom",
+      "es6"
+    ],
+    "target": "es6",
+    "noImplicitAny": true,
+    "removeComments": false,
+    "preserveConstEnums": true,
+    "sourceMap": true,
+    "inlineSources": true,
+    "declaration": true,
+    "skipLibCheck": true
+  },
+  "include": [
+    "bin/**/*",
+    "lib/**/*"
+  ],
+  "exclude": [
+    "**/node_modules",
+    "**/test/*"
+  ]
+}