WIP

crates/gui/src/button.rs

@@ -36,7 +36,8 @@ impl<'w, 's> ButtonCommands<'w, 's> for GuiCommands<'w, 's> {
             style: Style {
                 justify_content: JustifyContent::Center,
                 align_items: AlignItems::Center,
-                size: style.size,
+                width: style.width,
+                height: style.height,
                 margin: style.margin,
                 ..default()
             },

crates/menu/src/mainmenu.rs

@@ -53,7 +53,8 @@ fn button(commands: &mut GuiCommands, parent: Entity, action: ButtonAction, capt
     let button = commands
         .spawn_button(
             OuterStyle {
-                size: Size::new(Val::Percent(100.), Val::Percent(8.)),
+                width: Val::Percent(100.),
+                height: Val::Percent(8.),
                 margin: UiRect::new(
                     Val::Percent(0.),
                     Val::Percent(0.),

crates/multiplayer/src/game.rs

@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use de_core::{baseset::GameSet, player::Player};
+use de_core::player::Player;
 use de_net::{FromGame, FromServer, GameOpenError, JoinError, ToGame, ToServer};
 
 use crate::{

crates/multiplayer/src/messages.rs

@@ -1,7 +1,6 @@
 use std::{net::SocketAddr, time::Instant};
 
 use bevy::prelude::*;
-use de_core::baseset::GameSet;
 use de_net::{FromGame, FromServer, InPackage, PackageBuilder, Peers, ToGame, ToServer};
 
 use crate::{

crates/multiplayer/src/network.rs

@@ -5,7 +5,6 @@ use bevy::{
     prelude::*,
     tasks::{IoTaskPool, Task},
 };
-use de_core::baseset::GameSet;
 use de_net::{
     startup, ConnErrorReceiver, InPackage, OutPackage, PackageReceiver, PackageSender, Socket,
 };

crates/multiplayer/src/stats.rs

@@ -4,7 +4,6 @@ use std::{
 };
 
 use bevy::prelude::*;
-use de_core::baseset::GameSet;
 use de_net::{FromGame, ToGame};
 use tracing::{debug, info, trace};
 

crates/objects/src/solids.rs

@@ -4,7 +4,7 @@ use bevy::{
     asset::{AssetLoader, LoadContext, LoadedAsset},
     ecs::system::SystemParam,
     prelude::*,
-    reflect::TypeUuid,
+    reflect::{TypePath, TypeUuid},
     utils::BoxedFuture,
 };
 use de_core::{objects::ObjectType, state::AppState};
@@ -65,7 +65,7 @@ impl AssetCollectionLoader for Solids {
     }
 }
 
-#[derive(TypeUuid)]
+#[derive(TypeUuid, TypePath)]
 #[uuid = "7b0690cc-951e-487b-8e69-db3119f5fb32"]
 pub struct SolidObject {
     ichnography: Ichnography,

crates/pathing/src/fplugin.rs

@@ -5,7 +5,6 @@ use bevy::{
     tasks::{AsyncComputeTaskPool, Task},
 };
 use de_core::{
-    baseset::GameSet,
     gamestate::GameState,
     objects::{ObjectType, StaticSolid},
     state::AppState,

crates/signs/src/bars.rs

@@ -14,7 +14,6 @@ use bevy::{
 };
 use de_camera::{CameraDistance, DistanceSet};
 use de_core::{
-    baseset::GameSet,
     objects::{Active, ObjectType},
     state::AppState,
     visibility::{VisibilityFlags, VisibilitySet},

crates/signs/src/line.rs

@@ -2,7 +2,6 @@ use ahash::AHashMap;
 use bevy::prelude::*;
 use bevy::reflect::TypeUuid;
 use bevy::render::render_resource::{AsBindGroup, ShaderRef};
-use de_core::baseset::GameSet;
 use de_core::cleanup::DespawnOnGameExit;
 use de_core::objects::Active;
 use de_core::state::AppState;

crates/signs/src/markers.rs

@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 use de_camera::{CameraDistance, DistanceSet};
-use de_core::{baseset::GameSet, state::AppState};
+use de_core::state::AppState;
 use de_terrain::MarkerVisibility;
 
 use crate::{DISTANCE_FLAG_BIT, MAX_VISIBILITY_DISTANCE};

crates/signs/src/pole.rs

@@ -1,8 +1,8 @@
 use ahash::{AHashMap, AHashSet};
 use bevy::prelude::*;
 use de_core::{
-    baseset::GameSet, cleanup::DespawnOnGameExit, objects::ObjectType, projection::ToAltitude,
-    state::AppState, vecord::Vec2Ord,
+    cleanup::DespawnOnGameExit, objects::ObjectType, projection::ToAltitude, state::AppState,
+    vecord::Vec2Ord,
 };
 use de_objects::{AssetCollection, SceneType, Scenes};
 

crates/spawner/src/destroyer.rs

@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use de_core::{baseset::GameSet, objects::ObjectType, player::Player, state::AppState};
+use de_core::{objects::ObjectType, player::Player, state::AppState};
 use de_objects::Health;
 
 use crate::{ObjectCounter, SpawnerSet};

crates/spawner/src/draft.rs

@@ -8,7 +8,6 @@ use bevy::pbr::NotShadowReceiver;
 use bevy::scene::SceneInstance;
 use bevy::{pbr::NotShadowCaster, prelude::*};
 use de_core::{
-    baseset::GameSet,
     gamestate::GameState,
     objects::{ActiveObjectType, BuildingType, MovableSolid, ObjectType, StaticSolid},
     projection::ToFlat,

crates/spawner/src/gameend.rs

@@ -1,8 +1,5 @@
 use bevy::prelude::*;
-use de_core::{
-    baseset::GameSet, gamestate::GameState, gconfig::GameConfig, gresult::GameResult,
-    state::AppState,
-};
+use de_core::{gamestate::GameState, gconfig::GameConfig, gresult::GameResult, state::AppState};
 
 use crate::ObjectCounter;
 
@@ -11,7 +8,7 @@ pub(crate) struct GameEndPlugin;
 impl Plugin for GameEndPlugin {
     fn build(&self, app: &mut App) {
         app.add_systems(
-            GameSet::PostUpdate,
+            PostUpdate,
             game_end_detection_system.run_if(in_state(GameState::Playing)),
         );
     }

crates/spawner/src/spawner.rs

@@ -2,7 +2,6 @@
 
 use bevy::prelude::*;
 use de_core::{
-    baseset::GameSet,
     gamestate::GameState,
     gconfig::GameConfig,
     objects::{Active, ActiveObjectType, MovableSolid, ObjectType, Playable, StaticSolid},

crates/terrain/src/plugin.rs

@@ -6,7 +6,7 @@ use bevy::{
         texture::ImageSampler,
     },
 };
-use de_core::{baseset::GameSet, gamestate::GameState, state::AppState};
+use de_core::{gamestate::GameState, state::AppState};
 use iyes_progress::prelude::*;
 
 use crate::{shader::TerrainMaterial, terrain::Terrain};