From 258dbbd98f84bea5ca4815ab80d861f82cd54415 Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 14 Jan 2022 07:53:32 +0100 Subject: [PATCH] Fix duplicate exports --- src/js/game/buildings/logic_gate.js | 2 +- src/js/game/buildings/virtual_processor.js | 2 +- src/js/game/map_chunk_aggregate.js | 3 +-- src/js/mods/modloader.js | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/js/game/buildings/logic_gate.js b/src/js/game/buildings/logic_gate.js index b61d4373..a0e63c06 100644 --- a/src/js/game/buildings/logic_gate.js +++ b/src/js/game/buildings/logic_gate.js @@ -15,7 +15,7 @@ export const enumLogicGateVariants = { }; /** @enum {string} */ -export const enumVariantToGate = { +const enumVariantToGate = { [defaultBuildingVariant]: enumLogicGateType.and, [enumLogicGateVariants.not]: enumLogicGateType.not, [enumLogicGateVariants.xor]: enumLogicGateType.xor, diff --git a/src/js/game/buildings/virtual_processor.js b/src/js/game/buildings/virtual_processor.js index b4f91762..ab32a0d3 100644 --- a/src/js/game/buildings/virtual_processor.js +++ b/src/js/game/buildings/virtual_processor.js @@ -19,7 +19,7 @@ export const enumVirtualProcessorVariants = { }; /** @enum {string} */ -export const enumVariantToGate = { +const enumVariantToGate = { [defaultBuildingVariant]: enumLogicGateType.cutter, [enumVirtualProcessorVariants.rotater]: enumLogicGateType.rotater, [enumVirtualProcessorVariants.unstacker]: enumLogicGateType.unstacker, diff --git a/src/js/game/map_chunk_aggregate.js b/src/js/game/map_chunk_aggregate.js index de15362d..f47ed676 100644 --- a/src/js/game/map_chunk_aggregate.js +++ b/src/js/game/map_chunk_aggregate.js @@ -2,10 +2,9 @@ import { globalConfig } from "../core/config"; import { DrawParameters } from "../core/draw_parameters"; import { drawSpriteClipped } from "../core/draw_utils"; import { safeModulo } from "../core/utils"; +import { CHUNK_OVERLAY_RES } from "./map_chunk_view"; import { GameRoot } from "./root"; -export const CHUNK_OVERLAY_RES = 3; - export class MapChunkAggregate { /** * diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index 5732b083..beb9e5e1 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -1,7 +1,6 @@ import { createLogger } from "../core/logging"; import { Mod } from "./mod"; import { ModInterface } from "./mod_interface"; -import { MetaBuilding } from "../game/meta_building"; import { MOD_SIGNALS } from "./mod_signals"; const LOG = createLogger("mods"); @@ -45,7 +44,7 @@ export class ModLoader { continue; } if (exports[member]) { - continue; + throw new Error("Duplicate export of " + member); } Object.defineProperty(exports, member, { get() {