7 files changed, 20 insertions(+), 21 deletions(-)

M crates/api/src/routes/sign_save.rs
M crates/client/src/lib.rs
M crates/client/src/networking/mod.rs
M crates/client/src/rendering/mod.rs
M crates/client/src/ui/colors.rs
M crates/client/src/wasm/assets.rs
M crates/common/src/lib.rs

@@ 24,7 24,7 @@ use actix_web::{
 use log::error;
 use serde::{Deserialize, Serialize};
 use starkingdoms_common::{
-    __noverify__unpack_savefile, pack_savefile, unpack_savefile, PartType, SaveModule,
+    __noverify_unpack_savefile, pack_savefile, unpack_savefile, PartType, SaveModule,
 };
 use std::collections::HashMap;
 use std::hash::Hash;


@@ 63,7 63,7 @@ pub async fn sign_save_req(
     state: Data<AppState>,
 ) -> JsonAPIResponse<SignSaveResponse> {
     let old_save = handle_error!(unpack_savefile(&state.key_raw, req.old_save.clone()));
-    let new_save = handle_error!(__noverify__unpack_savefile(req.new_partial.clone()));
+    let new_save = handle_error!(__noverify_unpack_savefile(req.new_partial.clone()));
 
     // ensure part counts are the same
     let mut part_counts_old: HashMap<PartType, u64> = HashMap::new();

@@ 1,13 1,13 @@
 use bevy_ecs::{event::Events, world::World};
-use components::{Camera, Chat, Menu, Part, Player, RecvPacket, SendPacket, Texture, Transform};
-use nalgebra::{Rotation2, Rotation3, Scale2, Scale3, Translation2, Translation3, Vector3};
+use components::{Camera, Chat, Part, Player, RecvPacket, SendPacket, Texture, Transform};
+use nalgebra::{Rotation2, Scale3, Translation3};
 use networking::ws::Ws;
 use rendering::App;
 use platform::assets::Assets;
-use starkingdoms_common::packet::Packet;
 use tracing::info;
 use winit::event_loop::{ControlFlow, EventLoop};
 use crate::components::PlayerResources;
+use rendering::assets::AssetLoader;
 
 #[cfg(target_arch = "wasm32")]
 #[path = "wasm/mod.rs"]

@@ 6,7 6,7 @@ use bevy_ecs::{
     query::{QuerySingleError, With},
     world::World,
 };
-use nalgebra::{Rotation2, Scale2, Scale3, Translation3};
+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};


@@ 45,7 45,7 @@ fn texture_name(part_type: PartType, attached: bool) -> String {
 
 pub fn process_packets(
     world: &mut World,
-    send_packet_events: &mut Events<SendPacket>,
+    _send_packet_events: &mut Events<SendPacket>,
     recv_packet_events: &mut Events<RecvPacket>,
     planet_types: &mut HashMap<PlanetType, (Entity, u32)>,
 ) {


@@ 76,7 76,7 @@ pub fn process_packets(
                     ));
                 }
             }
-            SpawnPlayer { id, username } => {
+            SpawnPlayer { id, .. } => {
                 // username sync, eventually
                 world.spawn((
                     Transform {


@@ 112,10 112,10 @@ pub fn process_packets(
                         let server_id = match player_query.get_single(world) {
                             Ok(player) => player,
                             Err(e) => match e {
-                                QuerySingleError::NoEntities(s) => {
+                                QuerySingleError::NoEntities(_) => {
                                     continue;
                                 }
-                                QuerySingleError::MultipleEntities(s) => {
+                                QuerySingleError::MultipleEntities(_) => {
                                     panic!("There should never multiple players marked as players");
                                 }
                             },


@@ 130,7 130,7 @@ pub fn process_packets(
                         world
                             .query::<(Entity, &ServerId, &mut Transform, &mut Texture, &mut Part)>(
                             );
-                    for (entity, server_id, mut transform, mut texture, mut bevy_part) in
+                    for (_, server_id, mut transform, mut texture, mut bevy_part) in
                         part_query.iter_mut(world)
                     {
                         if server_id.0 == *id {


@@ 151,7 151,6 @@ pub fn process_packets(
             }
             PlanetPositions { planets } => {
                 for (server_id, planet) in planets {
-                    let mut planet_query = world.query_filtered::<&mut Transform, With<Planet>>();
                     if !planet_types.contains_key(&planet.planet_type) {
                         let entity = world.spawn(SpriteBundle {
                             transform: Transform {


@@ 215,7 214,7 @@ pub fn process_packets(
                     world.entity_mut(id).insert(Menu);
                 }
             }
-            Message { message_type, actor, content } => {
+            Message { actor, content, .. } => {
                 let mut chat = world.get_resource_mut::<Chat>().unwrap();
                 chat.messages.push(format!("{}: {}", actor.clone(), content.clone()));
             }

@@ 6,7 6,6 @@ use bevy_ecs::entity::Entity;
 use bevy_ecs::event::Events;
 use bevy_ecs::query::With;
 use bevy_ecs::world::World;
-use egui::{Label, ProgressBar};
 use egui_glow::EguiGlow;
 use glow::{HasContext, PixelUnpackData};
 #[cfg(not(target_arch = "wasm32"))]


@@ 20,7 19,7 @@ use glutin::{
 };
 #[cfg(not(target_arch = "wasm32"))]
 use glutin_winit::{DisplayBuilder, GlWindow};
-use nalgebra::{Matrix4, Scale3, Translation2, Translation3, Vector3, Vector4};
+use nalgebra::{Scale3, Translation3, Vector3};
 use starkingdoms_common::packet::{ButtonType, Packet};
 use starkingdoms_common::PlanetType;
 #[cfg(target_arch = "wasm32")]


@@ 39,13 38,14 @@ use winit::{
     event::WindowEvent,
     event_loop::ActiveEventLoop,
     raw_window_handle::HasWindowHandle,
-    window::{Window, WindowAttributes},
+    window::{Window},
 };
 
 use crate::components::{Camera, Menu, Player, RecvPacket, SendPacket, Texture, Transform};
 use crate::networking::process_packets;
 use crate::networking::ws::Ws;
 use crate::ui::{draw_ui, init_ui};
+use assets::AssetLoader;
 
 pub mod assets;
 


@@ 335,7 335,7 @@ impl ApplicationHandler for App {
     fn window_event(
         &mut self,
         event_loop: &ActiveEventLoop,
-        window_id: winit::window::WindowId,
+        _window_id: winit::window::WindowId,
         event: winit::event::WindowEvent,
     ) {
         let event_response = self


@@ 498,11 498,10 @@ impl ApplicationHandler for App {
             &mut self.planet_types,
         );
 
-        let window = self.window.as_ref().unwrap();
         let gl = self.gl.as_ref().unwrap();
 
         let mut player = self.world.query_filtered::<&Transform, With<Player>>();
-        let player = player.single(&self.world);
+
         self.egui_glow
             .as_mut()
             .unwrap()

@@ 1,5 1,6 @@
 macro_rules! color {
     ($n:ident,rgb($r:expr, $g:expr, $b:expr)) => {
+        #[allow(dead_code)]
         pub const $n: ::egui::Color32 = ::egui::Color32::from_rgb($r, $g, $b);
     };
 }

@@ 8,7 8,7 @@ use bevy_ecs::system::Resource;
 use image::EncodableLayout;
 use poll_promise::Promise;
 use resvg::{tiny_skia, usvg};
-use crate::rendering::assets::AssetLoader;
+use crate::rendering::assets::{AssetLoader, ImgData};
 
 #[derive(Resource)]
 pub struct Assets {

@@ 110,7 110,7 @@ pub fn unpack_savefile(key: &[u8], file: String) -> Result<SaveData, Box<dyn Err
 
     Ok(save_data)
 }
-pub fn __noverify__unpack_savefile(file: String) -> Result<SaveData, Box<dyn Error>> {
+pub fn __noverify_unpack_savefile(file: String) -> Result<SaveData, Box<dyn Error>> {
     // << reverse! <<
     let savefile_bytes = base64::engine::general_purpose::STANDARD
         .decode(file)