cyclops-infobook-html 1.1.1 → 3.0.0

package/CHANGELOG.md

@@ -1,6 +1,30 @@
 # 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
+
+### Changed
+* [Update to MC 1.16](https://github.com/CyclopsMC/infobook-html/commit/249b211cb524414db95e3600dcdf14d9304926db)
+* [Also extract mod data](https://github.com/CyclopsMC/infobook-html/commit/c11023465f93c2018deaa10e14270102398dfb2a)
+* [Update footer year](https://github.com/CyclopsMC/infobook-html/commit/c946bab5c16c293b8a6a01a1c7ee1eb9c28b0ad6)
+  
+### Fixed
+* [Fix incorrect dumpregistries command](https://github.com/CyclopsMC/infobook-html/commit/90bf5675f8a71170e36e91d41c01d5ec94fab430)
+* [Fix server start failing after install in a hacky way](https://github.com/CyclopsMC/infobook-html/commit/03319253969e45b76d98b7b918bbf493c5985693)
+
+<a name="v1.1.2"></a>
+## [v1.1.2](https://github.com/CyclopsMC/infobook-html/compare/v1.1.1...v1.1.2) - 2019-07-31
+
+### Fixed
+* [Fix some URLs ending with two slashes](https://github.com/CyclopsMC/infobook-html/commit/8bb6b5f2efaa5babdbb0365258a911e82121ec74)
+
 <a name="v1.1.1"></a>
 ## [v1.1.1](https://github.com/CyclopsMC/infobook-html/compare/v1.1.0...v1.1.1) - 2019-07-31
 

package/README.md

@@ -3,7 +3,6 @@
 [![Build Status](https://travis-ci.org/CyclopsMC/infobook-html.svg?branch=master)](https://travis-ci.org/CyclopsMC/infobook-html)
 [![Coverage Status](https://coveralls.io/repos/github/CyclopsMC/infobook-html/badge.svg?branch=master)](https://coveralls.io/github/CyclopsMC/infobook-html?branch=master)
 [![npm version](https://badge.fury.io/js/infobook-html.svg)](https://www.npmjs.com/package/infobook-html)
-[![Greenkeeper badge](https://badges.greenkeeper.io/CyclopsMC/infobook-html.svg)](https://greenkeeper.io/)
 
 Output Cyclops infobooks as HTML.
 
@@ -146,4 +145,4 @@ Example: [Integrated Dynamics plugin](https://github.com/CyclopsMC/infobook-html
 ## License
 This software is written by [Ruben Taelman](http://rubensworks.net/).
 
-This code is released under the [MIT license](http://opensource.org/licenses/MIT).
+This code is released under the [MIT license](http://opensource.org/licenses/MIT).

package/bin/generate-infobook-html.js

@@ -7,7 +7,7 @@ const minimist = require("minimist");
 const path_1 = require("path");
 const InfoBookAppendixHandlerAdvancementRewards_1 = require("../lib/infobook/appendix/InfoBookAppendixHandlerAdvancementRewards");
 const InfoBookAppendixHandlerCraftingRecipe_1 = require("../lib/infobook/appendix/InfoBookAppendixHandlerCraftingRecipe");
-const InfoBookAppendixHandlerFurnaceRecipe_1 = require("../lib/infobook/appendix/InfoBookAppendixHandlerFurnaceRecipe");
+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 InfoBookInitializer_1 = require("../lib/infobook/InfoBookInitializer");
@@ -57,8 +57,8 @@ function create() {
         // Setup infobook loader
         const infoBookInitializer = new InfoBookInitializer_1.InfoBookInitializer(config);
         infoBookInitializer.registerAppendixHandler('advancement_rewards', new InfoBookAppendixHandlerAdvancementRewards_1.InfoBookAppendixHandlerAdvancementRewards(resourceLoader.getResourceHandler()));
-        infoBookInitializer.registerAppendixHandler('crafting_recipe', new InfoBookAppendixHandlerCraftingRecipe_1.InfoBookAppendixHandlerCraftingRecipe(resourceLoader.getResourceHandler(), 'registries', config.recipeOverrides, config.recipePredefineds));
-        infoBookInitializer.registerAppendixHandler('furnace_recipe', new InfoBookAppendixHandlerFurnaceRecipe_1.InfoBookAppendixHandlerFurnaceRecipe(resourceLoader.getResourceHandler(), 'registries'));
+        infoBookInitializer.registerAppendixHandler('minecraft:crafting', new InfoBookAppendixHandlerCraftingRecipe_1.InfoBookAppendixHandlerCraftingRecipe(resourceLoader.getResourceHandler(), 'registries', config.recipeOverrides));
+        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()));
         // Load plugins
@@ -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/bin/generate-mod-metadata.js

@@ -44,7 +44,25 @@ function run(command, configPath) {
                 if (!modLoader.areModsInstalled()) {
                     yield modLoader.installMods();
                 }
-                yield modLoader.startServer();
+                // Multiple attempts for starting the server
+                // Needed because for some reason this can fail when happening right after Forge installation
+                let attempts = 0;
+                let lastError;
+                do {
+                    try {
+                        yield modLoader.startServer();
+                        lastError = undefined;
+                        break;
+                    }
+                    catch (error) {
+                        lastError = error;
+                        process.stdout.write('Failed to start server, retrying after delay...\n');
+                        yield new Promise((resolve) => setTimeout(resolve, 5000));
+                    }
+                } while (attempts++ < 5);
+                if (lastError) {
+                    throw lastError;
+                }
                 yield modLoader.copyRegistries(path_1.join(process.cwd(), 'registries'));
                 yield modLoader.extractMinecraftAssets();
                 yield modLoader.extractModsAssets();

package/index.d.ts

@@ -1,8 +1,9 @@
 export * from "./lib/infobook/appendix/IInfoBookAppendixHandler";
 export * from "./lib/infobook/appendix/InfoBookAppendixAd";
+export * from "./lib/infobook/appendix/InfoBookAppendixHandlerAbstractRecipe";
 export * from "./lib/infobook/appendix/InfoBookAppendixHandlerAdvancementRewards";
 export * from "./lib/infobook/appendix/InfoBookAppendixHandlerCraftingRecipe";
-export * from "./lib/infobook/appendix/InfoBookAppendixHandlerFurnaceRecipe";
+export * from "./lib/infobook/appendix/InfoBookAppendixHandlerSmeltingRecipe";
 export * from "./lib/infobook/appendix/InfoBookAppendixHandlerImage";
 export * from "./lib/infobook/appendix/InfoBookAppendixHandlerKeybinding";
 export * from "./lib/infobook/appendix/InfoBookAppendixTagIndex";

package/index.js

@@ -1,14 +1,23 @@
 "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);
 tslib_1.__exportStar(require("./lib/infobook/appendix/InfoBookAppendixHandlerCraftingRecipe"), exports);
-tslib_1.__exportStar(require("./lib/infobook/appendix/InfoBookAppendixHandlerFurnaceRecipe"), exports);
+tslib_1.__exportStar(require("./lib/infobook/appendix/InfoBookAppendixHandlerSmeltingRecipe"), exports);
 tslib_1.__exportStar(require("./lib/infobook/appendix/InfoBookAppendixHandlerImage"), exports);
 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/IItem.d.ts

@@ -1,6 +1,5 @@
 export interface IItem {
     item: string;
-    data: number;
     count?: number;
     nbt?: string;
 }

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.d.ts

@@ -0,0 +1,27 @@
+import { ResourceHandler } from "../../resource/ResourceHandler";
+import { HtmlInfoBookSerializer, ISerializeContext } from "../../serialize/HtmlInfoBookSerializer";
+import { IFileWriter } from "../IFileWriter";
+import { IInfoAppendix } from "../IInfoAppendix";
+import { IInfoBookAppendixHandler } from "./IInfoBookAppendixHandler";
+/**
+ * Handles abstract recipe appendices.
+ */
+export declare abstract class InfoBookAppendixHandlerAbstractRecipe<R extends IRecipe> implements IInfoBookAppendixHandler {
+    protected readonly id: string;
+    protected readonly resourceHandler: ResourceHandler;
+    protected readonly registry: IRecipeRegistryIndexed<R>;
+    constructor(id: string, resourceHandler: ResourceHandler, registriesPath: string, recipeOverrides: any);
+    static indexRegistry<R extends IRecipe>(registryRead: IRecipeRegistryRead<R>): IRecipeRegistryIndexed<R>;
+    createAppendix(data: any): IInfoAppendix;
+    protected abstract getRecipeNameUnlocalized(): string;
+    protected abstract serializeRecipe(recipe: R, context: ISerializeContext, fileWriter: IFileWriter, serializer: HtmlInfoBookSerializer): string;
+}
+export interface IRecipeRegistryRead<R extends IRecipe> {
+    recipes: [R];
+}
+export interface IRecipeRegistryIndexed<R extends IRecipe> {
+    [id: string]: R;
+}
+export interface IRecipe {
+    id: string;
+}

package/lib/infobook/appendix/InfoBookAppendixHandlerAbstractRecipe.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InfoBookAppendixHandlerAbstractRecipe = void 0;
+const fs = require("fs");
+const path_1 = require("path");
+/**
+ * Handles abstract recipe appendices.
+ */
+class InfoBookAppendixHandlerAbstractRecipe {
+    constructor(id, resourceHandler, registriesPath, recipeOverrides) {
+        this.id = id;
+        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(Object.assign({}, this.registry), (recipeOverrides[id] || {}));
+        }
+    }
+    static indexRegistry(registryRead) {
+        const index = {};
+        for (const recipe of registryRead.recipes) {
+            index[recipe.id] = recipe;
+        }
+        return index;
+    }
+    createAppendix(data) {
+        const recipeId = data._;
+        let recipes = [];
+        if (recipeId.includes('*')) {
+            const recipeRegex = new RegExp(recipeId);
+            for (const [k, v] of Object.entries(this.registry)) {
+                if (recipeRegex.exec(k)) {
+                    recipes.push(v);
+                }
+            }
+        }
+        else if (this.registry[recipeId]) {
+            recipes = [this.registry[recipeId]];
+        }
+        if (recipes.length === 0) {
+            throw new Error(`Could not find ${this.id} recipe for ${recipeId}`);
+        }
+        return {
+            getName: (context) => this.resourceHandler.getTranslation(this.getRecipeNameUnlocalized(), context.language),
+            toHtml: (context, fileWriter, serializer) => {
+                return recipes.map((recipe) => this.serializeRecipe(recipe, context, fileWriter, serializer)).join('<hr />');
+            },
+        };
+    }
+}
+exports.InfoBookAppendixHandlerAbstractRecipe = InfoBookAppendixHandlerAbstractRecipe;
+//# sourceMappingURL=InfoBookAppendixHandlerAbstractRecipe.js.map

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.
@@ -21,8 +22,7 @@ class InfoBookAppendixHandlerAdvancementRewards {
                 throw new Error(`Unknown achievement reward type '${rewardTag.$.type}'`);
             }
             const count = rewardTag.$.amount;
-            const meta = rewardTag.$.meta || 0;
-            rewardsData.push({ item: rewardTag._, data: meta, count });
+            rewardsData.push({ item: rewardTag._, count });
         }
         return {
             getName: (context) => this.resourceHandler.getTranslation('gui.advancements', context.language),

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

@@ -1,32 +1,21 @@
 import { ResourceHandler } from "../../resource/ResourceHandler";
 import { HtmlInfoBookSerializer, ISerializeContext } from "../../serialize/HtmlInfoBookSerializer";
 import { IFileWriter } from "../IFileWriter";
-import { IInfoAppendix } from "../IInfoAppendix";
 import { IItem } from "../IItem";
-import { IInfoBookAppendixHandler } from "./IInfoBookAppendixHandler";
+import { InfoBookAppendixHandlerAbstractRecipe, IRecipe } from "./InfoBookAppendixHandlerAbstractRecipe";
 /**
  * Handles crafting recipe appendices.
  */
-export declare class InfoBookAppendixHandlerCraftingRecipe implements IInfoBookAppendixHandler {
-    private readonly resourceHandler;
-    private readonly registry;
-    private readonly registryTagged;
-    private readonly recipePredefineds;
+export declare class InfoBookAppendixHandlerCraftingRecipe extends InfoBookAppendixHandlerAbstractRecipe<IRecipeCrafting> {
     private readonly templateCraftingRecipe;
-    constructor(resourceHandler: ResourceHandler, registriesPath: string, recipeOverrides: any, recipePredefineds: IRecipePredefineds);
-    createAppendix(data: any): IInfoAppendix;
-    protected serializeRecipe(recipe: IRecipe, context: ISerializeContext, fileWriter: IFileWriter, serializer: HtmlInfoBookSerializer): string;
+    constructor(resourceHandler: ResourceHandler, registriesPath: string, recipeOverrides: any);
+    protected getRecipeNameUnlocalized(): string;
+    protected serializeRecipe(recipe: IRecipeCrafting, context: ISerializeContext, fileWriter: IFileWriter, serializer: HtmlInfoBookSerializer): string;
 }
-export interface IRecipeRegistry {
-    [id: string]: [IRecipe];
-}
-export interface IRecipe {
+export interface IRecipeCrafting extends IRecipe {
+    id: string;
     input: IItem[][];
     output: IItem;
-    width: number;
-    height: number;
-    tags: string[];
-}
-export interface IRecipePredefineds {
-    [id: string]: IRecipe;
+    width?: number;
+    height?: number;
 }

package/lib/infobook/appendix/InfoBookAppendixHandlerCraftingRecipe.js

@@ -1,68 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs = require("fs");
-const path_1 = require("path");
+exports.InfoBookAppendixHandlerCraftingRecipe = void 0;
 const pug_1 = require("pug");
+const InfoBookAppendixHandlerAbstractRecipe_1 = require("./InfoBookAppendixHandlerAbstractRecipe");
 /**
  * Handles crafting recipe appendices.
  */
-class InfoBookAppendixHandlerCraftingRecipe {
-    constructor(resourceHandler, registriesPath, recipeOverrides, recipePredefineds) {
-        this.resourceHandler = resourceHandler;
-        this.registry = JSON.parse(fs.readFileSync(path_1.join(registriesPath, 'crafting_recipe.json'), "utf8"));
-        if (recipeOverrides) {
-            this.registry = Object.assign({}, this.registry, recipeOverrides);
-        }
-        this.recipePredefineds = recipePredefineds;
-        this.registryTagged = {};
-        for (const recipeId in this.registry) {
-            for (const recipe of this.registry[recipeId]) {
-                for (const tag of recipe.tags) {
-                    let recipes = this.registryTagged[tag];
-                    if (!recipes) {
-                        recipes = this.registryTagged[tag] = [];
-                    }
-                    recipes.push(recipe);
-                }
-            }
-        }
+class InfoBookAppendixHandlerCraftingRecipe extends InfoBookAppendixHandlerAbstractRecipe_1.InfoBookAppendixHandlerAbstractRecipe {
+    constructor(resourceHandler, registriesPath, recipeOverrides) {
+        super('minecraft:crafting', resourceHandler, registriesPath, recipeOverrides);
         this.templateCraftingRecipe = pug_1.compileFile(__dirname + '/../../../template/appendix/crafting_recipe.pug');
     }
-    createAppendix(data) {
-        let index = data.$.index || 0;
-        // const meta = data.$.meta || 0;
-        // const count = data.$.count || 1;
-        const outputName = data._;
-        let recipes;
-        if (data.$.predefined) {
-            const predefined = this.recipePredefineds[outputName];
-            if (!predefined) {
-                throw new Error(`Could not find any predefined recipe for ${outputName}`);
-            }
-            recipes = [predefined];
-        }
-        else {
-            recipes = this.registry[outputName];
-            if (!recipes) {
-                recipes = this.registryTagged['crafting_recipe:' + outputName];
-                index = -1;
-            }
-        }
-        if (!recipes) {
-            throw new Error(`Could not find any recipe for ${outputName}`);
-        }
-        if (index > -1) {
-            if (index >= recipes.length) {
-                throw new Error(`Could not find recipe ${index} for ${outputName} that only has ${recipes.length} recipes.`);
-            }
-            recipes = [recipes[index]];
-        }
-        return {
-            getName: (context) => this.resourceHandler.getTranslation('tile.workbench.name', context.language),
-            toHtml: (context, fileWriter, serializer) => {
-                return recipes.map((recipe) => this.serializeRecipe(recipe, context, fileWriter, serializer)).join('<hr />');
-            },
-        };
+    getRecipeNameUnlocalized() {
+        return 'block.minecraft.crafting_table';
     }
     serializeRecipe(recipe, context, fileWriter, serializer) {
         // Prepare input array
@@ -83,7 +33,7 @@ class InfoBookAppendixHandlerCraftingRecipe {
                     items = [];
                 }
                 if (!items.length) {
-                    items.push({ item: 'minecraft:air', data: 0 });
+                    items.push({ item: 'minecraft:air' });
                 }
                 const outputIndex = y * 3 + x;
                 for (const item of items) {
@@ -92,7 +42,7 @@ class InfoBookAppendixHandlerCraftingRecipe {
             }
         }
         const output = serializer.createItemDisplay(this.resourceHandler, context, fileWriter, recipe.output, true);
-        const appendixIcon = serializer.createItemDisplay(this.resourceHandler, context, fileWriter, { item: 'minecraft:crafting_table', data: 0 }, false);
+        const appendixIcon = serializer.createItemDisplay(this.resourceHandler, context, fileWriter, { item: 'minecraft:crafting_table' }, false);
         return this.templateCraftingRecipe({ inputs, output, appendixIcon });
     }
 }

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.d.ts

@@ -0,0 +1,18 @@
+import { ResourceHandler } from "../../resource/ResourceHandler";
+import { HtmlInfoBookSerializer, ISerializeContext } from "../../serialize/HtmlInfoBookSerializer";
+import { IFileWriter } from "../IFileWriter";
+import { IItem } from "../IItem";
+import { InfoBookAppendixHandlerAbstractRecipe, IRecipe } from "./InfoBookAppendixHandlerAbstractRecipe";
+/**
+ * Handles furnace recipe appendices.
+ */
+export declare class InfoBookAppendixHandlerSmeltingRecipe extends InfoBookAppendixHandlerAbstractRecipe<IRecipeSmelting> {
+    private readonly templateFurnaceRecipe;
+    constructor(resourceHandler: ResourceHandler, registriesPath: string, recipeOverrides: any);
+    protected getRecipeNameUnlocalized(): string;
+    protected serializeRecipe(recipe: IRecipeSmelting, context: ISerializeContext, fileWriter: IFileWriter, serializer: HtmlInfoBookSerializer): string;
+}
+export interface IRecipeSmelting extends IRecipe {
+    input: IItem[];
+    output: IItem;
+}

package/lib/infobook/appendix/InfoBookAppendixHandlerSmeltingRecipe.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InfoBookAppendixHandlerSmeltingRecipe = void 0;
+const pug_1 = require("pug");
+const InfoBookAppendixHandlerAbstractRecipe_1 = require("./InfoBookAppendixHandlerAbstractRecipe");
+/**
+ * Handles furnace recipe appendices.
+ */
+class InfoBookAppendixHandlerSmeltingRecipe extends InfoBookAppendixHandlerAbstractRecipe_1.InfoBookAppendixHandlerAbstractRecipe {
+    constructor(resourceHandler, registriesPath, recipeOverrides) {
+        super('minecraft:smelting', resourceHandler, registriesPath, recipeOverrides);
+        this.templateFurnaceRecipe = pug_1.compileFile(__dirname + '/../../../template/appendix/furnace_recipe.pug');
+    }
+    getRecipeNameUnlocalized() {
+        return 'block.minecraft.furnace';
+    }
+    serializeRecipe(recipe, context, fileWriter, serializer) {
+        const input = recipe.input.map((item) => serializer.createItemDisplay(this.resourceHandler, context, fileWriter, item, true));
+        const output = serializer.createItemDisplay(this.resourceHandler, context, fileWriter, recipe.output, true);
+        const appendixIcon = serializer.createItemDisplay(this.resourceHandler, context, fileWriter, { item: 'minecraft:furnace' }, false);
+        return this.templateFurnaceRecipe({ input, output, appendixIcon });
+    }
+}
+exports.InfoBookAppendixHandlerSmeltingRecipe = InfoBookAppendixHandlerSmeltingRecipe;
+//# sourceMappingURL=InfoBookAppendixHandlerSmeltingRecipe.js.map

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
@@ -15,13 +16,13 @@ class InfoBookAppendixTagIndex {
             const url = context.sectionIndex.tags[tag];
             // First try localizing as item, and if that fails, as fluid
             let icon;
-            const item = { item: tag, data: 0 };
+            const item = { item: tag };
             let translationKey = this.resourceHandler.getItemTranslationKey(item);
             if (translationKey) {
                 icon = serializer.createItemDisplay(this.resourceHandler, context, fileWriter, item, false);
             }
             else {
-                const fluid = { fluid: tag.substr(tag.indexOf(':') + 1) };
+                const fluid = { fluid: tag };
                 translationKey = this.resourceHandler.getFluidTranslationKey(fluid);
                 icon = serializer.createFluidDisplay(this.resourceHandler, context, fileWriter, fluid, false);
             }

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.
  */
@@ -49,6 +51,9 @@ class ModLoader {
             // Install Forge
             process.stdout.write('Installing Forge...\n');
             yield new Promise((resolve, reject) => child_process_1.exec(`cd ${this.path} && java -jar forge-installer.jar --installServer`).on('exit', resolve));
+            // Wait a bit, because otherwise some files don't exist yet (while they should...)
+            process.stdout.write('Wait a bit after Forge installation...\n');
+            yield new Promise((resolve) => setTimeout(resolve, 10000));
             // Cleanup
             process.stdout.write('Cleaning up...\n');
             yield fs.promises.unlink(installerFile);
@@ -114,18 +119,25 @@ 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) => {
-                proc.addListener('exit', resolve);
+                proc.addListener('exit', (code) => {
+                    if (code === 0) {
+                        resolve();
+                    }
+                    else {
+                        reject('Server closed with non-zero exit code');
+                    }
+                });
                 proc.addListener('error', reject);
             });
             // 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, '/cyclops dumpregistries');
+                    this.sendCommand(proc, '/cyclopscore dumpregistries');
                     this.sendCommand(proc, '/stop');
                 }
             });
@@ -164,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
@@ -221,8 +238,8 @@ class ModLoader {
                 }
                 else {
                     // File
-                    if (entry.fileName.startsWith('assets/')) {
-                        const targetFile = path_1.join(this.path, 'mod_assets', entry.fileName.substring(7, entry.fileName.length));
+                    if (entry.fileName.startsWith('assets/') || entry.fileName.startsWith('data/')) {
+                        const targetFile = path_1.join(this.path, 'mod_assets', entry.fileName.substring(entry.fileName.startsWith('assets/') ? 7 : 5, entry.fileName.length));
                         const targetDir = path_1.dirname(targetFile);
                         this.ensureDirExists(targetDir).then(() => {
                             zipFile.openReadStream(entry, (e, readStream) => {

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.d.ts

@@ -26,20 +26,18 @@ export declare class ResourceHandler {
      * Add an entry to a {@llink IItemKeyedRegistry}.
      * @param {string} namespace The namespace.
      * @param {string} path The path.
-     * @param {number} meta The meta.
      * @param {string} nbt The NBT. (empty string represents no NBT)
      * @param {string} value The value.
      */
-    protected static addItemKeyedRegistryEntry(registry: IItemKeyedRegistry, namespace: string, path: string, meta: number, nbt: string, value: string): void;
+    protected static addItemKeyedRegistryEntry(registry: IItemKeyedRegistry, namespace: string, path: string, nbt: string, value: string): void;
     /**
      * Get an value from a {@llink IItemKeyedRegistry}.
      * @param {string} namespace The namespace.
      * @param {string} path The path.
-     * @param {number} meta The meta.
      * @param {string} nbt The NBT. (empty string represents no NBT)
      * @return The value.
      */
-    protected static getItemKeyedRegistryEntry(registry: IItemKeyedRegistry, namespace: string, path: string, meta: number, nbt?: string): string;
+    protected static getItemKeyedRegistryEntry(registry: IItemKeyedRegistry, namespace: string, path: string, nbt?: string): string;
     /**
      * @returns {string[]} All available language keys.
      */
@@ -75,19 +73,17 @@ export declare class ResourceHandler {
      * Add an item icon file.
      * @param {string} namespace The icon namespace.
      * @param {string} path The icon path.
-     * @param {number} meta The icon meta.
      * @param {string} nbt The icon NBT. (empty string represents no NBT)
      * @param {string} file The icon file path.
      */
-    addItemIcon(namespace: string, path: string, meta: number, nbt: string, file: string): void;
+    addItemIcon(namespace: string, path: string, nbt: string, file: string): void;
     /**
      * Get an item icon file.
      * @param {string} itemId The icon namespace:path.
-     * @param {number} meta The icon meta.
      * @param {string} nbt The icon NBT. (empty string represents no NBT)
      * @return The icon file path or null.
      */
-    getItemIconFile(itemId: string, meta: number, nbt?: string): string;
+    getItemIconFile(itemId: string, nbt?: string): string;
     /**
      * Add a fluid icon file.
      * @param {string} fluidName The fluid name.
@@ -152,9 +148,7 @@ export declare class ResourceHandler {
 export interface IItemKeyedRegistry {
     [namespace: string]: {
         [path: string]: {
-            [meta: number]: {
-                [nbt: string]: string;
-            };
+            [nbt: string]: string;
         };
     };
 }

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.
@@ -30,22 +31,17 @@ class ResourceHandler {
      * Add an entry to a {@llink IItemKeyedRegistry}.
      * @param {string} namespace The namespace.
      * @param {string} path The path.
-     * @param {number} meta The meta.
      * @param {string} nbt The NBT. (empty string represents no NBT)
      * @param {string} value The value.
      */
-    static addItemKeyedRegistryEntry(registry, namespace, path, meta, nbt, value) {
+    static addItemKeyedRegistryEntry(registry, namespace, path, nbt, value) {
         let paths = registry[namespace];
         if (!paths) {
             paths = registry[namespace] = {};
         }
-        let metas = paths[path];
-        if (!metas) {
-            metas = paths[path] = {};
-        }
-        let nbts = metas[meta];
+        let nbts = paths[path];
         if (!nbts) {
-            nbts = metas[meta] = {};
+            nbts = paths[path] = {};
         }
         nbts[nbt] = value;
     }
@@ -53,20 +49,15 @@ class ResourceHandler {
      * Get an value from a {@llink IItemKeyedRegistry}.
      * @param {string} namespace The namespace.
      * @param {string} path The path.
-     * @param {number} meta The meta.
      * @param {string} nbt The NBT. (empty string represents no NBT)
      * @return The value.
      */
-    static getItemKeyedRegistryEntry(registry, namespace, path, meta, nbt = '') {
+    static getItemKeyedRegistryEntry(registry, namespace, path, nbt = '') {
         const paths = registry[namespace];
         if (!paths) {
             return null;
         }
-        const metas = paths[path];
-        if (!metas) {
-            return null;
-        }
-        const nbts = metas[meta];
+        const nbts = paths[path];
         if (!nbts) {
             return null;
         }
@@ -149,23 +140,21 @@ class ResourceHandler {
      * Add an item icon file.
      * @param {string} namespace The icon namespace.
      * @param {string} path The icon path.
-     * @param {number} meta The icon meta.
      * @param {string} nbt The icon NBT. (empty string represents no NBT)
      * @param {string} file The icon file path.
      */
-    addItemIcon(namespace, path, meta, nbt, file) {
-        ResourceHandler.addItemKeyedRegistryEntry(this.iconsItem, namespace, path, meta, nbt, file);
+    addItemIcon(namespace, path, nbt, file) {
+        ResourceHandler.addItemKeyedRegistryEntry(this.iconsItem, namespace, path, nbt, file);
     }
     /**
      * Get an item icon file.
      * @param {string} itemId The icon namespace:path.
-     * @param {number} meta The icon meta.
      * @param {string} nbt The icon NBT. (empty string represents no NBT)
      * @return The icon file path or null.
      */
-    getItemIconFile(itemId, meta, nbt = '') {
+    getItemIconFile(itemId, nbt = '') {
         const { namespace, path } = ResourceHandler.splitItemId(itemId);
-        return ResourceHandler.getItemKeyedRegistryEntry(this.iconsItem, namespace, path, meta, nbt);
+        return ResourceHandler.getItemKeyedRegistryEntry(this.iconsItem, namespace, path, nbt);
     }
     /**
      * Add a fluid icon file.
@@ -181,7 +170,7 @@ class ResourceHandler {
      * @return The icon file path or null.
      */
     getFluidIconFile(fluidName) {
-        return this.iconsFluid[fluidName];
+        return this.iconsFluid[fluidName.replace(':', '__')];
     }
     /**
      * Add an item translation key.
@@ -190,7 +179,7 @@ class ResourceHandler {
      */
     addItemTranslationKey(item, translationKey) {
         const { namespace, path } = ResourceHandler.splitItemId(item.item);
-        ResourceHandler.addItemKeyedRegistryEntry(this.itemTranslationKeys, namespace, path, item.data, item.nbt, translationKey);
+        ResourceHandler.addItemKeyedRegistryEntry(this.itemTranslationKeys, namespace, path, item.nbt, translationKey);
     }
     /**
      * Get an item translation key.
@@ -199,7 +188,7 @@ class ResourceHandler {
      */
     getItemTranslationKey(item) {
         const { namespace, path } = ResourceHandler.splitItemId(item.item);
-        return ResourceHandler.getItemKeyedRegistryEntry(this.itemTranslationKeys, namespace, path, item.data, item.nbt);
+        return ResourceHandler.getItemKeyedRegistryEntry(this.itemTranslationKeys, namespace, path, item.nbt);
     }
     /**
      * Add an fluid translation key.
@@ -264,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");
@@ -33,14 +34,16 @@ class ResourceLoader {
                 else {
                     const split = iconName.split("__");
                     const namespace = split[0];
-                    const path = split[1];
-                    const meta = parseInt(split[2], 10);
+                    let path = split[1];
                     let nbt = '';
-                    if (split.length > 3) {
-                        nbt = split.slice(3, split.length).join(":");
+                    if (split.length > 2) {
+                        nbt = split.slice(2, split.length).join(":");
                         nbt = nbt.substr(0, nbt.length - 4);
                     }
-                    this.resourceHandler.addItemIcon(namespace, path, meta, nbt, iconFile);
+                    else {
+                        path = path.substr(0, path.length - 4);
+                    }
+                    this.resourceHandler.addItemIcon(namespace, path, nbt, iconFile);
                 }
             }
         });
@@ -158,16 +161,7 @@ class ResourceLoader {
      */
     loadAssetsLangFile(modid, language, fullFilePath) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const translations = {};
-            const lines = (yield fs_1.promises.readFile(fullFilePath)).toString('utf8').split('\n');
-            for (const line of lines) {
-                if (line.length > 0 && line[0] !== '#') {
-                    const separatorIndex = line.indexOf('=');
-                    const key = line.substr(0, separatorIndex);
-                    const value = line.substr(separatorIndex + 1);
-                    translations[key] = value;
-                }
-            }
+            const translations = JSON.parse((yield fs_1.promises.readFile(fullFilePath)).toString('utf8'));
             this.resourceHandler.addTranslations(language, translations);
         });
     }

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 });
@@ -176,7 +177,7 @@ class HtmlInfoBookSerializer {
         if (item.item === 'minecraft:air') {
             return slot ? '<div class="item item-slot">&nbsp;</div>' : '<div class="item">&nbsp;</div>';
         }
-        const icon = resourceHandler.getItemIconFile(item.item, item.data, item.nbt);
+        const icon = resourceHandler.getItemIconFile(item.item, item.nbt);
         if (!icon) {
             throw new Error(`Could not find an icon for item ${JSON.stringify(item)}`);
         }
@@ -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,16 +201,11 @@ 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) {
-        if (fluidName === 'water' || fluidName === 'lava') {
-            return 'minecraft:' + fluidName;
-        }
-        else {
-            return context.modId + ':' + fluidName;
-        }
+        return fluidName;
     }
     getLanguagePath(language, path) {
         path = path || '';
@@ -267,7 +263,7 @@ class HtmlInfoBookSerializer {
     filePathToUrl(filePath, basePath, baseUrl) {
         let url = filePath.replace(basePath, baseUrl);
         const last = path_1.basename(url);
-        if (last.indexOf('.') < 0) {
+        if (!url.endsWith('/') && last.indexOf('.') < 0) {
             url = url + '/';
         }
         return url;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cyclops-infobook-html",
-  "version": "1.1.1",
+  "version": "3.0.0",
   "description": "Output Cyclops infobooks as HTML",
   "main": "index.js",
   "repository": "git@github.com:CyclopsMC/infobook-html.git",
@@ -50,16 +50,16 @@
     "testEnvironment": "node"
   },
   "devDependencies": {
-    "@types/jest": "^24.0.13",
+    "@types/jest": "^26.0.0",
     "@types/minimist": "^1.2.0",
     "coveralls": "^3.0.3",
-    "jest": "^24.8.0",
+    "jest": "^26.0.0",
     "manual-git-changelog": "^1.0.1",
     "pre-commit": "^1.2.2",
-    "ts-jest": "^24.0.2",
-    "tslint": "^5.16.0",
+    "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}",
@@ -75,19 +75,19 @@
   "dependencies": {
     "@types/mkdirp": "^0.5.2",
     "@types/ncp": "^2.0.1",
-    "@types/node": "^12.0.2",
+    "@types/node": "^13.1.0",
     "@types/node-fetch": "^2.5.0",
     "@types/pug": "^2.0.4",
-    "@types/rimraf": "^2.0.2",
+    "@types/rimraf": "^3.0.0",
     "@types/xml2js": "^0.4.4",
     "@types/yauzl": "^2.9.1",
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",
-    "mvn-artifact-download": "^4.0.0",
+    "mvn-artifact-download": "^5.0.0",
     "ncp": "^2.0.0",
     "node-fetch": "^2.6.0",
-    "pug": "^2.0.3",
-    "rimraf": "^2.6.3",
+    "pug": "^3.0.0",
+    "rimraf": "^3.0.0",
     "xml2js": "^0.4.19",
     "yauzl": "^2.10.0"
   }

package/template/includes/footer.pug

@@ -1,4 +1,4 @@
 footer
     p Generated with <a href="https://github.com/CyclopsMC/infobook-html" target="blank">cyclops-infobook-html</a>.
-    p <a href="https://www.rubensworks.net/">Ruben Taelman</a> &#169; 2019
+    p <a href="https://www.rubensworks.net/">Ruben Taelman</a> &#169; 2019-now
     script(src="/assets/main.js")

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

@@ -1,18 +0,0 @@
-import { ResourceHandler } from "../../resource/ResourceHandler";
-import { IInfoAppendix } from "../IInfoAppendix";
-import { IItem } from "../IItem";
-import { IInfoBookAppendixHandler } from "./IInfoBookAppendixHandler";
-/**
- * Handles furnace recipe appendices.
- */
-export declare class InfoBookAppendixHandlerFurnaceRecipe implements IInfoBookAppendixHandler {
-    private readonly resourceHandler;
-    private readonly registry;
-    private readonly templateFurnaceRecipe;
-    constructor(resourceHandler: ResourceHandler, registriesPath: string);
-    createAppendix(data: any): IInfoAppendix;
-}
-export interface IRecipeFurnace {
-    input: IItem[];
-    output: IItem;
-}

package/lib/infobook/appendix/InfoBookAppendixHandlerFurnaceRecipe.js

@@ -1,41 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = require("fs");
-const path_1 = require("path");
-const pug_1 = require("pug");
-/**
- * Handles furnace recipe appendices.
- */
-class InfoBookAppendixHandlerFurnaceRecipe {
-    constructor(resourceHandler, registriesPath) {
-        this.resourceHandler = resourceHandler;
-        this.registry = JSON.parse(fs.readFileSync(path_1.join(registriesPath, 'furnace_recipe.json'), "utf8")).elements;
-        this.templateFurnaceRecipe = pug_1.compileFile(__dirname + '/../../../template/appendix/furnace_recipe.pug');
-    }
-    createAppendix(data) {
-        // const meta = data.$.meta || 0;
-        // const count = data.$.count || 1;
-        const outputName = data._;
-        let recipe;
-        for (const recipeIt of this.registry) {
-            if (recipeIt.output.item === outputName) {
-                recipe = recipeIt;
-                break;
-            }
-        }
-        if (!recipe) {
-            throw new Error(`Could not find any recipe for ${outputName}`);
-        }
-        return {
-            getName: (context) => this.resourceHandler.getTranslation('tile.furnace.name', context.language),
-            toHtml: (context, fileWriter, serializer) => {
-                const input = recipe.input.map((item) => serializer.createItemDisplay(this.resourceHandler, context, fileWriter, item, true));
-                const output = serializer.createItemDisplay(this.resourceHandler, context, fileWriter, recipe.output, true);
-                const appendixIcon = serializer.createItemDisplay(this.resourceHandler, context, fileWriter, { item: 'minecraft:furnace', data: 0 }, false);
-                return this.templateFurnaceRecipe({ input, output, appendixIcon });
-            },
-        };
-    }
-}
-exports.InfoBookAppendixHandlerFurnaceRecipe = InfoBookAppendixHandlerFurnaceRecipe;
-//# sourceMappingURL=InfoBookAppendixHandlerFurnaceRecipe.js.map