From ff01258c32f86a02dc82075c059903f0ebbbe2e2 Mon Sep 17 00:00:00 2001 From: core Date: Sat, 6 Apr 2024 22:44:06 -0400 Subject: [PATCH] fix --- .woodpecker/.backplane.yaml | 6 +++--- .woodpecker/.server.yaml | 6 +++--- starkingdoms-client/src/hub.ts | 4 +--- starkingdoms-client/src/pages/Play.svelte | 6 ++---- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.woodpecker/.backplane.yaml b/.woodpecker/.backplane.yaml index f3b8e5da121bdd715b090478dd8810e2246c520a..00b1eb68b78ed8b0d85856d6492e8ac81da8dd41 100644 --- a/.woodpecker/.backplane.yaml +++ b/.woodpecker/.backplane.yaml @@ -1,20 +1,20 @@ steps: - name: backplane_fmt - image: coresdev/stk_build_env + image: rust:alpine commands: - cd starkingdoms-backplane - rustfmt **/*.rs --check --edition 2021 --color always environment: CARGO_INCREMENTAL: "0" - name: backplane_clippy - image: coresdev/stk_build_env + image: rust:alpine commands: - cd starkingdoms-backplane - cargo clippy --profile release-ci --color always environment: CARGO_INCREMENTAL: "0" - name: backplane_build - image: coresdev/stk_build_env + image: rust:alpine commands: - cd starkingdoms-backplane - cargo build --profile release-ci --color always diff --git a/.woodpecker/.server.yaml b/.woodpecker/.server.yaml index 5c745f413c50c820d067512143464e435228e556..e95515b1e4f05dfd53d9b2f607ad8fb73d500c23 100644 --- a/.woodpecker/.server.yaml +++ b/.woodpecker/.server.yaml @@ -1,20 +1,20 @@ steps: - name: server_fmt - image: coresdev/stk_build_env + image: rust:alpine commands: - cd server - rustfmt **/*.rs --check --edition 2021 --color always environment: CARGO_INCREMENTAL: "0" - name: server_clippy - image: coresdev/stk_build_env + image: rust:alpine commands: - cd server - cargo clippy --profile release-ci --color always environment: CARGO_INCREMENTAL: "0" - name: server_build - image: coresdev/stk_build_env + image: rust:alpine commands: - cd server - cargo build --profile release-ci --color always diff --git a/starkingdoms-client/src/hub.ts b/starkingdoms-client/src/hub.ts index dcd99178c4ae918cc0cfa36cb775d0dcbe01ef47..52dee5ea7a849b006967a54877d6378b23127d0a 100644 --- a/starkingdoms-client/src/hub.ts +++ b/starkingdoms-client/src/hub.ts @@ -19,7 +19,6 @@ import { global } from "./globals.ts"; import { startRender } from "./rendering.ts"; import { ButtonType } from "./protocol.ts"; import type Chatbox from "./components/Chatbox.svelte"; -import type Button from "./components/ui/Button.svelte"; import { part_texture_url } from "./textures.js"; import * as PIXI from "pixi.js"; @@ -46,8 +45,7 @@ export async function hub_connect( velocity: HTMLSpanElement, x_pos: HTMLSpanElement, y_pos: HTMLSpanElement, - energy: HTMLDivElement, - beam_out_button: Button, + energy: HTMLDivElement ): Promise { logger("connecting to client hub at " + url); diff --git a/starkingdoms-client/src/pages/Play.svelte b/starkingdoms-client/src/pages/Play.svelte index 86da2bdf243dcb2ea1443588a17328ff3fcd4e96..a4c144523fae1b015d64168b1ba69c87e0cb8bc0 100644 --- a/starkingdoms-client/src/pages/Play.svelte +++ b/starkingdoms-client/src/pages/Play.svelte @@ -10,10 +10,10 @@ import { onMount } from "svelte"; import Popup from "../components/ui/Popup.svelte"; import Checkbox from "../components/ui/Checkbox.svelte"; - import Button from "../components/ui/Button.svelte"; import { global } from "../globals.ts"; import { PacketType } from "../protocol.ts"; import * as PIXI from "pixi.js"; + import Button from "../components/ui/Button.svelte"; let config = DEFAULT_CONFIG; @@ -25,7 +25,6 @@ //let antialiasing: boolean = false; let chatbox: Chatbox; - let beam_out_button: Button; const logger = createDebug("main"); logger( @@ -108,7 +107,6 @@ x_pos, y_pos, energy, - beam_out_button, ); }); @@ -167,7 +165,7 @@ -