cyclops-infobook-html 2.0.0 → 3.0.0

package/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+<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
+
+### Changed
+* [Update to MC 1.18](https://github.com/CyclopsMC/infobook-html/commit/1fb77959593a2b84cb14e56406f0df20ad450e16)
+
 <a name="v2.0.0"></a>
 ## [v2.0.0](https://github.com/CyclopsMC/infobook-html/compare/v1.1.2...v2.0.0) - 2021-02-03
 

package/bin/generate-infobook-html.js

@@ -88,7 +88,7 @@ function create() {
             path += '/';
         }
         const infoBookSerializer = new HtmlInfoBookSerializer_1.HtmlInfoBookSerializer();
-        yield infoBookSerializer.serialize(infoBook, Object.assign({}, config, { headSuffixGetters,
+        yield infoBookSerializer.serialize(infoBook, Object.assign(Object.assign({}, config), { headSuffixGetters,
             mods,
             path, resourceHandler: resourceLoader.getResourceHandler(), root: true }), assetsPaths);
     });

package/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./lib/infobook/appendix/IInfoBookAppendixHandler"), exports);
 tslib_1.__exportStar(require("./lib/infobook/appendix/InfoBookAppendixAd"), exports);
 tslib_1.__exportStar(require("./lib/infobook/appendix/InfoBookAppendixHandlerAbstractRecipe"), exports);
 tslib_1.__exportStar(require("./lib/infobook/appendix/InfoBookAppendixHandlerAdvancementRewards"), exports);
@@ -10,6 +11,13 @@ tslib_1.__exportStar(require("./lib/infobook/appendix/InfoBookAppendixHandlerIma
 tslib_1.__exportStar(require("./lib/infobook/appendix/InfoBookAppendixHandlerKeybinding"), exports);
 tslib_1.__exportStar(require("./lib/infobook/appendix/InfoBookAppendixTagIndex"), exports);
 tslib_1.__exportStar(require("./lib/infobook/FileWriter"), exports);
+tslib_1.__exportStar(require("./lib/infobook/IFileWriter"), exports);
+tslib_1.__exportStar(require("./lib/infobook/IFluid"), exports);
+tslib_1.__exportStar(require("./lib/infobook/IInfoAppendix"), exports);
+tslib_1.__exportStar(require("./lib/infobook/IInfoBook"), exports);
+tslib_1.__exportStar(require("./lib/infobook/IInfobookPlugin"), exports);
+tslib_1.__exportStar(require("./lib/infobook/IInfoSection"), exports);
+tslib_1.__exportStar(require("./lib/infobook/IItem"), exports);
 tslib_1.__exportStar(require("./lib/infobook/InfoBookInitializer"), exports);
 tslib_1.__exportStar(require("./lib/modloader/ModLoader"), exports);
 tslib_1.__exportStar(require("./lib/parse/XmlInfoBookParser"), exports);

package/lib/infobook/FileWriter.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.FileWriter = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 /**

package/lib/infobook/InfoBookInitializer.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.InfoBookInitializer = void 0;
 const tslib_1 = require("tslib");
 const XmlInfoBookParser_1 = require("../parse/XmlInfoBookParser");
 const InfoBookAppendixTagIndex_1 = require("./appendix/InfoBookAppendixTagIndex");

package/lib/infobook/appendix/InfoBookAppendixAd.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.InfoBookAppendixAd = void 0;
 const pug_1 = require("pug");
 /**
  * An appendix with an add

package/lib/infobook/appendix/InfoBookAppendixHandlerAbstractRecipe.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.InfoBookAppendixHandlerAbstractRecipe = void 0;
 const fs = require("fs");
 const path_1 = require("path");
 /**
@@ -11,7 +12,7 @@ class InfoBookAppendixHandlerAbstractRecipe {
         this.resourceHandler = resourceHandler;
         this.registry = InfoBookAppendixHandlerAbstractRecipe.indexRegistry(JSON.parse(fs.readFileSync(path_1.join(registriesPath, id.replace(/:/g, '__') + '.json'), "utf8")));
         if (recipeOverrides) {
-            this.registry = Object.assign({}, this.registry, (recipeOverrides[id] || {}));
+            this.registry = Object.assign(Object.assign({}, this.registry), (recipeOverrides[id] || {}));
         }
     }
     static indexRegistry(registryRead) {

package/lib/infobook/appendix/InfoBookAppendixHandlerAdvancementRewards.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.InfoBookAppendixHandlerAdvancementRewards = void 0;
 const pug_1 = require("pug");
 /**
  * Handles advancement rewards appendices.

package/lib/infobook/appendix/InfoBookAppendixHandlerCraftingRecipe.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.InfoBookAppendixHandlerCraftingRecipe = void 0;
 const pug_1 = require("pug");
 const InfoBookAppendixHandlerAbstractRecipe_1 = require("./InfoBookAppendixHandlerAbstractRecipe");
 /**

package/lib/infobook/appendix/InfoBookAppendixHandlerImage.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.InfoBookAppendixHandlerImage = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 /**

package/lib/infobook/appendix/InfoBookAppendixHandlerKeybinding.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.InfoBookAppendixHandlerKeybinding = void 0;
 const pug_1 = require("pug");
 /**
  * Handles keybindings appendices.

package/lib/infobook/appendix/InfoBookAppendixHandlerSmeltingRecipe.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.InfoBookAppendixHandlerSmeltingRecipe = void 0;
 const pug_1 = require("pug");
 const InfoBookAppendixHandlerAbstractRecipe_1 = require("./InfoBookAppendixHandlerAbstractRecipe");
 /**

package/lib/infobook/appendix/InfoBookAppendixTagIndex.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.InfoBookAppendixTagIndex = void 0;
 const pug_1 = require("pug");
 /**
  * An appendix that lists all tags with links to them

package/lib/modloader/ModLoader.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModLoader = void 0;
 const tslib_1 = require("tslib");
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
@@ -11,6 +12,7 @@ const path_1 = require("path");
 const rimraf = require("rimraf");
 const util_1 = require("util");
 const yauzl_1 = require("yauzl");
+const Path = require("path");
 /**
  * Takes care of installing Forge, installing mods, starting a Forge server, and fetching metadata.
  */
@@ -117,7 +119,7 @@ class ModLoader {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             // Start the Forge server
             process.stdout.write('Starting server...\n');
-            const proc = child_process_1.exec(`cd ${this.path} && java -jar forge-*.jar nogui`);
+            const proc = child_process_1.exec(`cd ${this.path} && ./run.sh nogui`);
             // Ignore stdout: proc.stdout.pipe(process.stdout);
             proc.stderr.pipe(process.stderr);
             const onDone = new Promise((resolve, reject) => {
@@ -133,7 +135,7 @@ class ModLoader {
             });
             // Once the loading is complete, send our command and stop the server
             proc.stdout.on('data', (line) => {
-                if (line.indexOf('[minecraft/DedicatedServer]: Done') >= 0) {
+                if (line.indexOf('[Server thread/INFO]: Done') >= 0) {
                     process.stdout.write('Dumping registries...\n');
                     this.sendCommand(proc, '/cyclopscore dumpregistries');
                     this.sendCommand(proc, '/stop');
@@ -174,9 +176,14 @@ class ModLoader {
             }
             // Find Minecraft jar
             let jar = null;
-            for (const file of yield fs.promises.readdir(this.path)) {
-                if (file.startsWith('minecraft_server') && file.endsWith('.jar')) {
-                    jar = path_1.join(this.path, file);
+            const subPath = Path.join(this.path, 'libraries', 'net', 'minecraft', 'server');
+            for (const dir of yield fs.promises.readdir(subPath)) {
+                if (dir.indexOf('-') > 0) {
+                    for (const file of yield fs.promises.readdir(Path.join(subPath, dir))) {
+                        if (file.startsWith('server') && file.endsWith('extra.jar')) {
+                            jar = path_1.join(subPath, dir, file);
+                        }
+                    }
                 }
             }
             // Error if no jar was found

package/lib/parse/XmlInfoBookParser.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.XmlInfoBookParser = void 0;
 const fs = require("fs");
 const xml2js_1 = require("xml2js");
 /**

package/lib/resource/ResourceHandler.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ResourceHandler = void 0;
 const path_1 = require("path");
 /**
  * Allows Minecraft resources to be used.
@@ -252,9 +253,9 @@ class ResourceHandler {
         return keybinding;
     }
 }
+exports.ResourceHandler = ResourceHandler;
 ResourceHandler.TRANSLATION_DEFAULTS = {
     'fluid.tile.lava': 'Lava',
     'fluid.tile.water': 'Water',
 };
-exports.ResourceHandler = ResourceHandler;
 //# sourceMappingURL=ResourceHandler.js.map

package/lib/resource/ResourceLoader.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ResourceLoader = void 0;
 const tslib_1 = require("tslib");
 const fs_1 = require("fs");
 const path_1 = require("path");

package/lib/serialize/HtmlInfoBookSerializer.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.HtmlInfoBookSerializer = void 0;
 const tslib_1 = require("tslib");
 const fs_1 = require("fs");
 const mkdirp = require("mkdirp");
@@ -21,7 +22,7 @@ class HtmlInfoBookSerializer {
     }
     serialize(infobook, context, assetsPaths) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            context = Object.assign({}, context, { basePath: context.path, breadcrumbs: [] });
+            context = Object.assign(Object.assign({}, context), { basePath: context.path, breadcrumbs: [] });
             this.fileWriter = new FileWriter_1.FileWriter(context);
             yield this.ensureDirExists(context.path);
             yield this.ensureDirExists(path_1.join(context.path, 'assets'));
@@ -50,7 +51,7 @@ class HtmlInfoBookSerializer {
                 urlIndex: {},
             };
             let pageIndex = 0;
-            yield this.serializeSection(infobook.rootSection, Object.assign({}, contextRoot, { language, path: langPath }), ({ index, section, sectionTitle, fileUrl, breadcrumbs }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            yield this.serializeSection(infobook.rootSection, Object.assign(Object.assign({}, contextRoot), { language, path: langPath }), ({ index, section, sectionTitle, fileUrl, breadcrumbs }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 if (!index) {
                     sectionIndex.urlIndex[fileUrl] = pageIndex++;
                     const name = breadcrumbs.slice(1).map((b) => b.name).join(' / ');
@@ -68,7 +69,7 @@ class HtmlInfoBookSerializer {
     }
     serializeSectionFiles(infobook, contextRoot, language, langPath, sectionIndex) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            yield this.serializeSection(infobook.rootSection, Object.assign({}, contextRoot, { language, path: langPath, sectionIndex }), ({ index, breadcrumbs, context, section, sectionTitle, subSectionDatas, filePath, fileUrl }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            yield this.serializeSection(infobook.rootSection, Object.assign(Object.assign({}, contextRoot), { language, path: langPath, sectionIndex }), ({ index, breadcrumbs, context, section, sectionTitle, subSectionDatas, filePath, fileUrl }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 // Create links to this page in other languages
                 const languages = [];
                 for (const name of contextRoot.resourceHandler.getLanguages()) {
@@ -79,7 +80,7 @@ class HtmlInfoBookSerializer {
                 }
                 if (index) {
                     // Create index file
-                    const fileContents = this.templateIndex(Object.assign({}, context, { breadcrumbs, headSuffix: context.headSuffixGetters.map((g) => g(context)).join(''), languages,
+                    const fileContents = this.templateIndex(Object.assign(Object.assign({}, context), { breadcrumbs, headSuffix: context.headSuffixGetters.map((g) => g(context)).join(''), languages,
                         sectionTitle,
                         subSectionDatas }));
                     yield fs_1.promises.writeFile(filePath, fileContents);
@@ -97,7 +98,7 @@ class HtmlInfoBookSerializer {
                         appendices.unshift(new InfoBookAppendixAd_1.InfoBookAppendixAd());
                     }
                     // Create leaf file
-                    const fileContents = this.templateSection(Object.assign({}, context, { breadcrumbs, headSuffix: context.headSuffixGetters.map((g) => g(context)).join(''), languages,
+                    const fileContents = this.templateSection(Object.assign(Object.assign({}, context), { breadcrumbs, headSuffix: context.headSuffixGetters.map((g) => g(context)).join(''), languages,
                         nextPage,
                         previousPage, sectionAppendices: appendices
                             .filter((appendix) => appendix) // TODO: rm
@@ -128,7 +129,7 @@ class HtmlInfoBookSerializer {
             // Go in a subfolder when we are handling a different mod
             if (section.modId !== context.modId) {
                 yield this.ensureDirExists(path_1.join(context.path, section.modId));
-                context = Object.assign({}, context, { modId: section.modId, path: path_1.join(context.path, section.modId) });
+                context = Object.assign(Object.assign({}, context), { modId: section.modId, path: path_1.join(context.path, section.modId) });
             }
             if (section.subSections && section.subSections.length > 0) {
                 // Navigation section
@@ -140,9 +141,9 @@ class HtmlInfoBookSerializer {
                         url: fileUrl,
                     }]);
                 for (const subSection of section.subSections) {
-                    const subSectionData = yield this.serializeSection(subSection, Object.assign({}, context, { breadcrumbs: subBreadcrumbs, path: path_1.join(context.path, subSection.nameTranslationKey
+                    const subSectionData = yield this.serializeSection(subSection, Object.assign(Object.assign({}, context), { breadcrumbs: subBreadcrumbs, path: path_1.join(context.path, subSection.nameTranslationKey
                             .substr(subSection.nameTranslationKey.lastIndexOf('.') + 1)), root: false }), onSection);
-                    subSectionDatas.push(Object.assign({}, subSectionData, { url: this.filePathToUrl(subSectionData.filePath, context.basePath, context.baseUrl) }));
+                    subSectionDatas.push(Object.assign(Object.assign({}, subSectionData), { url: this.filePathToUrl(subSectionData.filePath, context.basePath, context.baseUrl) }));
                 }
                 const filePath = path_1.join(context.path, 'index.html');
                 yield onSection({ index: true, breadcrumbs, context, sectionTitle, section, subSectionDatas, filePath, fileUrl });
@@ -186,7 +187,7 @@ class HtmlInfoBookSerializer {
             throw new Error(`Could not find translation key for item ${JSON.stringify(item)}`);
         }
         const { link, linkTarget } = this.createResourceLink(resourceHandler, context, item.item, key);
-        return this.templateItem(Object.assign({}, context, { annotation, count: item.count || 1, icon: iconUrl, link,
+        return this.templateItem(Object.assign(Object.assign({}, context), { annotation, count: item.count || 1, icon: iconUrl, link,
             linkTarget, name: resourceHandler.getTranslation(resourceHandler.getItemTranslationKey(item), context.language), slot }));
     }
     createFluidDisplay(resourceHandler, context, fileWriter, fluid, slot) {
@@ -200,7 +201,7 @@ class HtmlInfoBookSerializer {
             throw new Error(`Could not find translation key for fluid ${JSON.stringify(fluid)}`);
         }
         const { link, linkTarget } = this.createResourceLink(resourceHandler, context, this.tagFluid(context, fluid.fluid), key);
-        return this.templateItem(Object.assign({}, context, { count: (fluid.amount || 1), icon: iconUrl, link,
+        return this.templateItem(Object.assign(Object.assign({}, context), { count: (fluid.amount || 1), icon: iconUrl, link,
             linkTarget, name: resourceHandler.getTranslation(resourceHandler.getFluidTranslationKey(fluid), context.language), slot }));
     }
     tagFluid(context, fluidName) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cyclops-infobook-html",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "Output Cyclops infobooks as HTML",
   "main": "index.js",
   "repository": "git@github.com:CyclopsMC/infobook-html.git",
@@ -59,7 +59,7 @@
     "ts-jest": "^26.0.0",
     "tslint": "^6.0.0",
     "tslint-eslint-rules": "^5.4.0",
-    "typescript": "^3.4.5"
+    "typescript": "^4.0.0"
   },
   "scripts": {
     "test": "jest ${1}",