From a6a517a96b9908d9667c82623d4f736fc123165a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D1=97=D0=BB=20=D0=93=D1=80=D0=B8?= =?UTF-8?q?=D0=B3=D0=BE=D1=80=27=D1=94=D0=B2?= Date: Sat, 14 Jun 2025 06:14:58 +0300 Subject: [PATCH] Remove highly redundant utils functions Remove isSupportedBrowser entirely and inline usages of getLogoSprite. --- src/js/core/background_resources_loader.js | 4 ++-- src/js/core/utils.js | 14 -------------- src/js/states/about.js | 5 ++--- src/js/states/main_menu.js | 3 +-- src/js/states/preload.js | 3 +-- 5 files changed, 6 insertions(+), 23 deletions(-) diff --git a/src/js/core/background_resources_loader.js b/src/js/core/background_resources_loader.js index b142ecf3..151fc276 100644 --- a/src/js/core/background_resources_loader.js +++ b/src/js/core/background_resources_loader.js @@ -9,12 +9,12 @@ import { AtlasDefinition, atlasFiles } from "./atlas_definitions"; import { Loader } from "./loader"; import { createLogger } from "./logging"; import { Signal } from "./signal"; -import { clamp, getLogoSprite, timeoutPromise } from "./utils"; +import { clamp, timeoutPromise } from "./utils"; const logger = createLogger("background_loader"); const MAIN_MENU_ASSETS = { - sprites: [getLogoSprite()], + sprites: ["logo.png"], sounds: [SOUNDS.uiClick, SOUNDS.uiError, SOUNDS.dialogError, SOUNDS.dialogOk], atlas: [], css: [], diff --git a/src/js/core/utils.js b/src/js/core/utils.js index a0e740bd..87ec41ff 100644 --- a/src/js/core/utils.js +++ b/src/js/core/utils.js @@ -399,13 +399,6 @@ export function removeAllChildren(elem) { } } -/** - * Returns if the game supports this browser - */ -export function isSupportedBrowser() { - return true; -} - /** * Formats an amount of seconds into something like "5s ago" * @param {number} secs Seconds @@ -659,13 +652,6 @@ export function getRomanNumber(number) { return formatted; } -/** - * Returns the appropriate logo sprite path - */ -export function getLogoSprite() { - return "logo.png"; -} - /** * Rejects a promise after X ms * @param {Promise} promise diff --git a/src/js/states/about.js b/src/js/states/about.js index 21ab7fac..c36229e7 100644 --- a/src/js/states/about.js +++ b/src/js/states/about.js @@ -1,7 +1,6 @@ +import { THIRDPARTY_URLS } from "../core/config"; import { TextualGameState } from "../core/textual_game_state"; import { T } from "../translations"; -import { THIRDPARTY_URLS } from "../core/config"; -import { getLogoSprite } from "../core/utils"; export class AboutState extends TextualGameState { constructor() { @@ -15,7 +14,7 @@ export class AboutState extends TextualGameState { getMainContentHTML() { return `
- shapez.io Logo + shapez.io Logo
${T.about.body diff --git a/src/js/states/main_menu.js b/src/js/states/main_menu.js index 3da641e1..8997502d 100644 --- a/src/js/states/main_menu.js +++ b/src/js/states/main_menu.js @@ -4,7 +4,6 @@ import { DialogWithForm } from "../core/modal_dialog_elements"; import { FormElementInput } from "../core/modal_dialog_forms"; import { formatSecondsToTimeAgo, - getLogoSprite, makeButton, makeDiv, makeDivElement, @@ -42,7 +41,7 @@ export class MainMenuState extends GameState {