~starkingdoms/starkingdoms

016f6cec6d73c13a2a5ccc704688260cdbc72d17 — core 8 months ago e378598
cargo fix
M crates/client/src/networking/mod.rs => crates/client/src/networking/mod.rs +1 -1
@@ 9,7 9,7 @@ use bevy_ecs::{
use nalgebra::{Rotation2, Scale3, Translation3};
use starkingdoms_common::{packet::Packet, PartType, PlanetType};

use crate::components::{Camera, Chat, Menu, Part, Planet, Player, PlayerResources, RecvPacket, SendPacket, ServerId, SpriteBundle, Texture, Transform};
use crate::components::{Camera, Chat, Menu, Part, Player, PlayerResources, RecvPacket, SendPacket, ServerId, SpriteBundle, Texture, Transform};

#[cfg(target_arch = "wasm32")]
#[path = "ws_wasm.rs"]

M crates/client/src/rendering/mod.rs => crates/client/src/rendering/mod.rs +2 -2
@@ 476,7 476,7 @@ impl ApplicationHandler for App {
        }
    }
    fn about_to_wait(&mut self, event_loop: &ActiveEventLoop) {
        let mut ws = self
        let ws = self
            .world
            .get_resource_mut::<Ws>()
            .expect("Failed to get Ws resource");


@@ 500,7 500,7 @@ impl ApplicationHandler for App {

        let gl = self.gl.as_ref().unwrap();

        let mut player = self.world.query_filtered::<&Transform, With<Player>>();
        let player = self.world.query_filtered::<&Transform, With<Player>>();

        self.egui_glow
            .as_mut()

M crates/client/src/ui/mod.rs => crates/client/src/ui/mod.rs +1 -1
@@ 7,7 7,7 @@ use bevy_ecs::entity::Entity;
use bevy_ecs::event::Events;
use bevy_ecs::prelude::With;
use bevy_ecs::world::World;
use egui::{Align, Align2, CornerRadius, CursorIcon, Layout, Margin, Order, ProgressBar, RichText, Shadow, Stroke, Visuals};
use egui::{Align, Align2, CursorIcon, Layout, Margin, Order, RichText, Shadow, Visuals};
use starkingdoms_common::packet::Packet;
use crate::components::{Camera, Chat, Menu, Player, PlayerResources, SendPacket, Transform};
use crate::ui::widgets::{progress_bar, RichTextExt};

M crates/kabel/src/main.rs => crates/kabel/src/main.rs +1 -1
@@ 2,7 2,7 @@

use std::{env, fs, process::exit};

use kabel::{debug::{debug_ast, debug_bytecode, debug_stack, debug_token_array}, run_codegen, run_lexer, run_parser, run_semantic_analysis};
use kabel::{debug::{debug_ast, debug_bytecode}, run_codegen, run_lexer, run_parser, run_semantic_analysis};

fn main() {
    let args: Vec<String> = env::args().collect();

M crates/server/src/crafting/mining.rs => crates/server/src/crafting/mining.rs +2 -2
@@ 1,8 1,8 @@
use bevy::prelude::{Children, Entity, Query, Res, With};
use bevy::prelude::{Children, Entity, Query, Res};
use bevy_rapier2d::plugin::RapierContext;
use crate::{module::component::Attach, planet::PlanetType};

use super::components::{IsMining, MaterialType, VarietyMaterialStorage};
use super::components::{IsMining, VarietyMaterialStorage};
pub fn mine_materials(
    rapier_context: Res<RapierContext>,
    planet_query: Query<(&PlanetType, &Children)>,

M crates/server/src/player/client_login.rs => crates/server/src/player/client_login.rs +1 -1
@@ 6,7 6,7 @@ use hmac::{Hmac, Mac};
use jwt::VerifyWithKey;
use rand::Rng;
use sha2::Sha256;
use starkingdoms_common::{packet::{MessageType, Packet, Part, Planet, ProtoPartFlags}, proto_part_flags, proto_transform, unpack_savefile, PartType as c_PartType, PlanetType as c_PlanetType};
use starkingdoms_common::{packet::{MessageType, Packet, Part, Planet, ProtoPartFlags}, proto_part_flags, proto_transform, unpack_savefile, PartType as c_PartType};

use crate::{
    config::StkConfig, crafting::components::{IsMining, VarietyMaterialStorage}, module::{

M crates/xtask/src/main.rs => crates/xtask/src/main.rs +4 -7
@@ 1,18 1,15 @@
use std::env::{args, var};
use std::error::Error;
use std::fs;
use std::io::{Cursor, Read};
use std::net::{SocketAddr, TcpListener, TcpStream};
use std::io::Cursor;
use std::path::{Path, PathBuf};
use std::process::{Command, exit};
use std::str::FromStr;
use std::process::exit;
use std::sync::mpsc;
use std::sync::mpsc::TryRecvError;
use std::thread::sleep;
use std::time::Duration;
use colored::Colorize;
use notify::{Event, EventKind, RecursiveMode, Watcher};
use tiny_http::{Header, HeaderField, Response, Server, StatusCode};
use tiny_http::{Response, Server, StatusCode};
use wasm_pack::command::build::{BuildOptions, Target};
use wasm_pack::command::run_wasm_pack;
use wasm_pack::progressbar::LogLevel;


@@ 180,7 177,7 @@ fn main() {
                match res {
                    Ok(event) => {
                        if let EventKind::Modify(_) = event.kind {
                            let mut has_non_generated_update = false;
                            let has_non_generated_update = false;
                            for path in &event.paths {
                                if !path.to_str().unwrap().contains("client/pkg") && !path.to_str().unwrap().ends_with("~") {
                                    needs_rebuild = true;