From fa68e132865650a3f700cc3056d6a928b935e14d Mon Sep 17 00:00:00 2001 From: DJ1TJOO Date: Fri, 26 Feb 2021 16:41:17 +0100 Subject: [PATCH] Fixed imports --- src/js/core/buffer_maintainer.js | 2 +- src/js/game/buildings/wire.js | 2 +- src/js/game/hud/parts/layer_preview.js | 2 +- src/js/game/hud/parts/miner_highlight.js | 2 +- src/js/game/hud/parts/watermark.js | 2 +- src/js/game/hud/parts/wire_info.js | 4 ++-- src/js/game/systems/display.js | 4 ++-- src/js/game/systems/lever.js | 2 +- src/js/game/systems/wire.js | 4 ++-- src/js/modloader/mod.js | 2 ++ 10 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/js/core/buffer_maintainer.js b/src/js/core/buffer_maintainer.js index 065ec05a..673f820a 100644 --- a/src/js/core/buffer_maintainer.js +++ b/src/js/core/buffer_maintainer.js @@ -129,7 +129,7 @@ export class BufferMaintainer { * @param {number} param0.w * @param {number} param0.h * @param {number} param0.dpi - * @param {function(canvas: HTMLCanvasElement, context: CanvasRenderingContext2D, width: number, height: number, dpi: number, additionalParams: object?) : void} param0.redrawMethod + * @param {function(HTMLCanvasElement, CanvasRenderingContext2D, number, number, number, object?) : void} param0.redrawMethod * @param {object=} param0.additionalParams * @returns {HTMLCanvasElement} * diff --git a/src/js/game/buildings/wire.js b/src/js/game/buildings/wire.js index 231a5da9..43d0afb4 100644 --- a/src/js/game/buildings/wire.js +++ b/src/js/game/buildings/wire.js @@ -146,7 +146,7 @@ export class MetaWireBuilding extends MetaBuilding { * * @param {number} rotationVariant * @param {string} variant - * @returns {import("../../core/draw_utils").AtlasSprite} + * @returns {import("../../core/sprites").AtlasSprite} */ getPreviewSprite(rotationVariant, variant) { const wireVariant = MetaWireBuilding.wireVariantToVariant[variant]; diff --git a/src/js/game/hud/parts/layer_preview.js b/src/js/game/hud/parts/layer_preview.js index a90d7fe5..645a1cfd 100644 --- a/src/js/game/hud/parts/layer_preview.js +++ b/src/js/game/hud/parts/layer_preview.js @@ -98,7 +98,7 @@ export class HUDLayerPreview extends BaseHUDPart { /** * Renders the preview at the given position - * @param {import("../../../core/draw_utils").DrawParameters} parameters + * @param {import("../../../core/draw_parameters").DrawParameters} parameters * @param {Vector} worldPos * @param {number} scale 1 / zoomLevel */ diff --git a/src/js/game/hud/parts/miner_highlight.js b/src/js/game/hud/parts/miner_highlight.js index a0c6919d..40cc7ef3 100644 --- a/src/js/game/hud/parts/miner_highlight.js +++ b/src/js/game/hud/parts/miner_highlight.js @@ -11,7 +11,7 @@ export class HUDMinerHighlight extends BaseHUDPart { /** * - * @param {import("../../../core/draw_utils").DrawParameters} parameters + * @param {import("../../../core/draw_parameters").DrawParameters} parameters */ draw(parameters) { const mousePos = this.root.app.mousePosition; diff --git a/src/js/game/hud/parts/watermark.js b/src/js/game/hud/parts/watermark.js index 4a75ea76..cd8eb987 100644 --- a/src/js/game/hud/parts/watermark.js +++ b/src/js/game/hud/parts/watermark.js @@ -53,7 +53,7 @@ export class HUDWatermark extends BaseHUDPart { /** * - * @param {import("../../../core/draw_utils").DrawParameters} parameters + * @param {import("../../../core/draw_parameters").DrawParameters} parameters */ drawOverlays(parameters) { const w = this.root.gameWidth; diff --git a/src/js/game/hud/parts/wire_info.js b/src/js/game/hud/parts/wire_info.js index 60a34796..795beff0 100644 --- a/src/js/game/hud/parts/wire_info.js +++ b/src/js/game/hud/parts/wire_info.js @@ -13,7 +13,7 @@ export class HUDWireInfo extends BaseHUDPart { /** * - * @param {import("../../../core/draw_utils").DrawParameters} parameters + * @param {import("../../../core/draw_parameters").DrawParameters} parameters */ drawOverlays(parameters) { if (this.root.currentLayer !== "wires") { @@ -81,7 +81,7 @@ export class HUDWireInfo extends BaseHUDPart { /** * * - * @param {import("../../../core/draw_utils").DrawParameters} parameters + * @param {import("../../../core/draw_parameters").DrawParameters} parameters * @param {WireNetwork} network */ drawHighlightedNetwork(parameters, network) { diff --git a/src/js/game/systems/display.js b/src/js/game/systems/display.js index 7915e447..7a9e196a 100644 --- a/src/js/game/systems/display.js +++ b/src/js/game/systems/display.js @@ -12,7 +12,7 @@ export class DisplaySystem extends GameSystemWithFilter { constructor(root) { super(root, [DisplayComponent]); - /** @type {Object} */ + /** @type {Object} */ this.displaySprites = {}; for (const colorId in enumColors) { @@ -44,7 +44,7 @@ export class DisplaySystem extends GameSystemWithFilter { /** * Draws a given chunk - * @param {import("../../core/draw_utils").DrawParameters} parameters + * @param {import("../../core/draw_parameters").DrawParameters} parameters * @param {MapChunkView} chunk */ drawChunk_ForegroundStaticLayer(parameters, chunk) { diff --git a/src/js/game/systems/lever.js b/src/js/game/systems/lever.js index 2724229c..32ad8702 100644 --- a/src/js/game/systems/lever.js +++ b/src/js/game/systems/lever.js @@ -31,7 +31,7 @@ export class LeverSystem extends GameSystemWithFilter { /** * Draws a given chunk - * @param {import("../../core/draw_utils").DrawParameters} parameters + * @param {import("../../core/draw_parameters").DrawParameters} parameters * @param {MapChunkView} chunk */ drawChunk_ForegroundStaticLayer(parameters, chunk) { diff --git a/src/js/game/systems/wire.js b/src/js/game/systems/wire.js index 1e735515..bf86c85d 100644 --- a/src/js/game/systems/wire.js +++ b/src/js/game/systems/wire.js @@ -571,7 +571,7 @@ export class WireSystem extends GameSystemWithFilter { /** * Returns the given tileset and opacity * @param {WireComponent} wireComp - * @returns {{ spriteSet: Object, opacity: number}} + * @returns {{ spriteSet: Object, opacity: number}} */ getSpriteSetAndOpacityForWire(wireComp) { if (!wireComp.linkedNetwork) { @@ -601,7 +601,7 @@ export class WireSystem extends GameSystemWithFilter { /** * Draws a given chunk - * @param {import("../../core/draw_utils").DrawParameters} parameters + * @param {import("../../core/draw_parameters").DrawParameters} parameters * @param {MapChunkView} chunk */ drawChunk_WiresForegroundLayer(parameters, chunk) { diff --git a/src/js/modloader/mod.js b/src/js/modloader/mod.js index 8c03675e..cd6f5b9d 100644 --- a/src/js/modloader/mod.js +++ b/src/js/modloader/mod.js @@ -945,6 +945,8 @@ export class ShapezAPI { { meta: atlasData.atlasData.meta, sourceData: atlasData.atlasData.frames, + sourceFileName: null, + getFullSourcePath: null, }, sourceImage );