cyclops-infobook-html 3.0.0 → 3.1.0

package/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+<a name="v3.1.0"></a>
+## [v3.1.0](https://github.com/CyclopsMC/infobook-html/compare/v3.0.0...v3.1.0) - 2024-01-31
+
+### Added
+* [Support text field appendix](https://github.com/CyclopsMC/infobook-html/commit/6f24bbbd606b6cfd1237e3bf740e73ffc23008be)
+* [Allowing raw mod URLs in modpack](https://github.com/CyclopsMC/infobook-html/commit/11c9ed5adc554ae7dafa66a202ac83fcacd240fb)
+
 <a name="v3.0.0"></a>
 ## [v3.0.0](https://github.com/CyclopsMC/infobook-html/compare/v2.0.0...v3.0.0) - 2022-03-10
 

package/README.md

@@ -44,6 +44,11 @@ Before you can execute this phase, you need a `modpack.json` file with contents
 	  "type": "maven",
       "artifact": "org.cyclops.commoncapabilities:CommonCapabilities:1.12.2-2.4.4-309",
       "repo": "https://oss.jfrog.org/artifactory/simple/libs-release/"
+    },
+    {
+      "type": "raw",
+      "name": "integratedscripting-1.19.2-1.0.0-61.jar",
+      "url": "https://www.dropbox.com/s/mbbikni5ieyttuq/integratedscripting-1.19.2-1.0.0-61.jar?dl=1"
     }
   ]
 }

package/assets/styles.css

@@ -167,6 +167,11 @@ hr {
     top: 1px;
 }
 
+.appendix-textfield {
+    text-align: left;
+    padding: 10px;
+}
+
 .appendix .inputs {
     display: inline-block;
     vertical-align: middle;

package/bin/generate-infobook-html.js

@@ -10,6 +10,7 @@ const InfoBookAppendixHandlerCraftingRecipe_1 = require("../lib/infobook/appendi
 const InfoBookAppendixHandlerSmeltingRecipe_1 = require("../lib/infobook/appendix/InfoBookAppendixHandlerSmeltingRecipe");
 const InfoBookAppendixHandlerImage_1 = require("../lib/infobook/appendix/InfoBookAppendixHandlerImage");
 const InfoBookAppendixHandlerKeybinding_1 = require("../lib/infobook/appendix/InfoBookAppendixHandlerKeybinding");
+const InfoBookAppendixHandlerTextfield_1 = require("../lib/infobook/appendix/InfoBookAppendixHandlerTextfield");
 const InfoBookInitializer_1 = require("../lib/infobook/InfoBookInitializer");
 const ResourceLoader_1 = require("../lib/resource/ResourceLoader");
 const HtmlInfoBookSerializer_1 = require("../lib/serialize/HtmlInfoBookSerializer");
@@ -61,6 +62,7 @@ function create() {
         infoBookInitializer.registerAppendixHandler('minecraft:smelting', new InfoBookAppendixHandlerSmeltingRecipe_1.InfoBookAppendixHandlerSmeltingRecipe(resourceLoader.getResourceHandler(), 'registries', config.recipeOverrides));
         infoBookInitializer.registerAppendixHandler('image', new InfoBookAppendixHandlerImage_1.InfoBookAppendixHandlerImage(resourceLoader.getResourceHandler()));
         infoBookInitializer.registerAppendixHandler('keybinding', new InfoBookAppendixHandlerKeybinding_1.InfoBookAppendixHandlerKeybinding(resourceLoader.getResourceHandler()));
+        infoBookInitializer.registerAppendixHandler('textfield', new InfoBookAppendixHandlerTextfield_1.InfoBookAppendixHandlerTextfield(resourceLoader.getResourceHandler()));
         // Load plugins
         const assetsPaths = [];
         const headSuffixGetters = [];

package/lib/infobook/appendix/InfoBookAppendixHandlerTextfield.d.ts

@@ -0,0 +1,11 @@
+import { ResourceHandler } from "../../resource/ResourceHandler";
+import { IInfoAppendix } from "../IInfoAppendix";
+import { IInfoBookAppendixHandler } from "./IInfoBookAppendixHandler";
+/**
+ * Handles text field appendices.
+ */
+export declare class InfoBookAppendixHandlerTextfield implements IInfoBookAppendixHandler {
+    private readonly resourceHandler;
+    constructor(resourceHandler: ResourceHandler);
+    createAppendix(data: any): IInfoAppendix;
+}

package/lib/infobook/appendix/InfoBookAppendixHandlerTextfield.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InfoBookAppendixHandlerTextfield = void 0;
+/**
+ * Handles text field appendices.
+ */
+class InfoBookAppendixHandlerTextfield {
+    constructor(resourceHandler) {
+        this.resourceHandler = resourceHandler;
+    }
+    createAppendix(data) {
+        const contents = data._
+            .replace(/ /g, ' ')
+            .replace(/\n/g, '<br \>');
+        const scale = data.$.scale || 1;
+        return {
+            toHtml: (context, fileWriter) => {
+                return `<div class="appendix-textfield" style="font-size: ${scale}em">${contents}</div>`;
+            },
+        };
+    }
+}
+exports.InfoBookAppendixHandlerTextfield = InfoBookAppendixHandlerTextfield;
+//# sourceMappingURL=InfoBookAppendixHandlerTextfield.js.map

package/lib/modloader/ModLoader.d.ts

@@ -29,6 +29,7 @@ export declare class ModLoader {
      * Download and install mods.
      */
     installMods(): Promise<void>;
+    downloadFile(url: string, fileName: string, modsDir: string): Promise<void>;
     /**
      * Start the server and execute a command to dump all registries
      */
@@ -78,7 +79,7 @@ export interface IModLoaderArgs {
     versionForge: string;
     versionMinecraft: string;
 }
-export declare type IMod = IModMaven | IModCurseforge;
+export declare type IMod = IModMaven | IModCurseforge | IModRaw;
 export interface IModMaven {
     type: 'maven';
     artifact: string;
@@ -90,3 +91,8 @@ export interface IModCurseforge {
     artifact: string;
     version: string;
 }
+export interface IModRaw {
+    type: 'raw';
+    name: string;
+    url: string;
+}

package/lib/modloader/ModLoader.js

@@ -91,27 +91,36 @@ class ModLoader {
                     process.stdout.write(`  - ${fileName} from CurseForge...\n`);
                     const url = `https://minecraft.curseforge.com/api/maven/${mod.project}/${mod.artifact
                         .replace(/-/g, '/')}/${fileName}`;
-                    const response = yield node_fetch_1.default(url);
-                    if (response.status !== 200) {
-                        throw new Error(response.statusText + ' on ' + url);
-                    }
-                    yield new Promise((resolve, reject) => {
-                        response.body
-                            .on('error', reject)
-                            .on('end', resolve)
-                            .pipe(fs.createWriteStream(path_1.join(modsDir, fileName)));
-                    });
+                    yield this.downloadFile(url, fileName, modsDir);
                 }
                 else if (mod.type === 'maven') {
                     process.stdout.write(`  - ${mod.artifact} from ${mod.repo}...\n`);
                     yield mvn_artifact_download_1.default(mod.artifact, modsDir, mod.repo);
                 }
+                else if (mod.type === 'raw') {
+                    process.stdout.write(`  - ${mod.name} from ${mod.url}...\n`);
+                    yield this.downloadFile(mod.url, mod.name, modsDir);
+                }
                 else {
                     throw new Error('Unknown mod type ' + mod.type);
                 }
             }
         });
     }
+    downloadFile(url, fileName, modsDir) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const response = yield node_fetch_1.default(url);
+            if (response.status !== 200) {
+                throw new Error(response.statusText + ' on ' + url);
+            }
+            yield new Promise((resolve, reject) => {
+                response.body
+                    .on('error', reject)
+                    .on('end', resolve)
+                    .pipe(fs.createWriteStream(path_1.join(modsDir, fileName)));
+            });
+        });
+    }
     /**
      * Start the server and execute a command to dump all registries
      */
@@ -135,7 +144,7 @@ class ModLoader {
             });
             // Once the loading is complete, send our command and stop the server
             proc.stdout.on('data', (line) => {
-                if (line.indexOf('[Server thread/INFO]: Done') >= 0) {
+                if (line.indexOf('Done') >= 0 && line.indexOf('For help, type "help"') >= 0) {
                     process.stdout.write('Dumping registries...\n');
                     this.sendCommand(proc, '/cyclopscore dumpregistries');
                     this.sendCommand(proc, '/stop');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cyclops-infobook-html",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "Output Cyclops infobooks as HTML",
   "main": "index.js",
   "repository": "git@github.com:CyclopsMC/infobook-html.git",