diff --git a/docs/queries.rs b/docs/queries.rs new file mode 100644 index 0000000..522720d --- /dev/null +++ b/docs/queries.rs @@ -0,0 +1,6 @@ +commands: Commands + +tiles: Query<(&Tile, &TileId, Entity)>, +player: Option>, +hand_ent: Option>>, + diff --git a/jong/src/game.rs b/jong/src/game.rs index 9eed87f..571e066 100644 --- a/jong/src/game.rs +++ b/jong/src/game.rs @@ -1,28 +1,17 @@ -#![allow(unused)] - use bevy::prelude::*; use bevy_spacetimedb::{ ReadInsertUpdateMessage, ReadStdbConnectedMessage, ReadStdbDisconnectedMessage, StdbPlugin, - TableMessages, }; -use spacetimedb::Identity; -use spacetimedb_sdk::{DbContext, Table, credentials}; +use spacetimedb_sdk::{DbContext, Table}; use crate::stdb::{self, DbConnection, LobbyTableAccess, PlayerTableAccess, RemoteTables}; use crate::stdb::{ - add_bot, draw_tile, join_or_create_lobby, login_or_add_player, set_ready, shuffle_deal, + add_bot, draw_tile, set_ready, shuffle_deal, skip_call, start_game, }; use crate::{ SpacetimeDB, creds_store, - game::{ - self, - hand::{Drawn, Hand, Pond}, - player::{CurrentPlayer, MainPlayer, Player}, - round::Wind, - wall::Wall, - }, - tile::{self}, + game::hand::{Drawn, Hand, Pond}, }; use jong_types::*; @@ -34,7 +23,7 @@ pub mod wall; pub struct Riichi; impl Plugin for Riichi { fn build(&self, app: &mut App) { - let mut plugins = StdbPlugin::default() + let plugins = StdbPlugin::default() .with_uri("http://localhost:3000") .with_module_name("jongline") .with_run_fn(DbConnection::run_threaded) @@ -80,7 +69,7 @@ impl Plugin for Riichi { ; } } -fn on_connect(stdb: SpacetimeDB, mut messages: ReadStdbConnectedMessage, mut commands: Commands) { +fn on_connect(stdb: SpacetimeDB, mut messages: ReadStdbConnectedMessage, _commands: Commands) { for msg in messages.read() { info!("you're now jongline"); @@ -94,7 +83,7 @@ fn on_connect(stdb: SpacetimeDB, mut messages: ReadStdbConnectedMessage, mut com } // TODO how reconnect? -fn on_disconnect(stdb: SpacetimeDB, mut messages: ReadStdbDisconnectedMessage) { +fn on_disconnect(_stdb: SpacetimeDB, mut messages: ReadStdbDisconnectedMessage) { for msg in messages.read() { warn!("lost connection: {:#?}", msg.err); } @@ -118,26 +107,26 @@ fn subscriptions(stdb: SpacetimeDB) { pub struct TileId(pub u32); fn on_player_insert_update( - stdb: SpacetimeDB, + _stdb: SpacetimeDB, mut messages: ReadInsertUpdateMessage, mut commands: Commands, tiles: Query<(&Tile, &TileId, Entity)>, - mut player: Option>, - mut hand_ent: Option>>, + player: Option>, + hand_ent: Option>>, ) { use player::*; for msg in messages.read() { // debug!("player_insert_update msg:\n{:#?}", msg.new); - if let (Some(player), Some(hand_ent)) = (player.as_ref(), hand_ent.as_ref()) { + if let (Some(_player), Some(hand_ent)) = (player.as_ref(), hand_ent.as_ref()) { // if msg.old.as_ref().is_some_and(|m| !m.ready) && msg.new.ready { // trace!("entered ready"); // // TODO add a start game button in the future // stdb.reducers().start_game().unwrap(); // } - let mut tiles: Vec<_> = msg + let tiles: Vec<_> = msg .new .hand .iter() @@ -177,7 +166,7 @@ fn on_lobby_insert_update( stdb: SpacetimeDB, mut messages: ReadInsertUpdateMessage, - mut commands: Commands, + _commands: Commands, mut next_gamestate: ResMut>, mut next_turnstate: ResMut>, ) { diff --git a/jong/src/game/hand.rs b/jong/src/game/hand.rs index 4e89c13..2387f4a 100644 --- a/jong/src/game/hand.rs +++ b/jong/src/game/hand.rs @@ -1,8 +1,6 @@ -use std::mem::discriminant; use bevy::prelude::*; -use crate::game::{GameState, player::Player, wall::Wall}; use jong_types::*; #[derive(Component)] @@ -26,7 +24,7 @@ pub struct Discarded; // } /// assumes hand is sorted -pub(crate) fn check_wincon(hand: &[Tile; 14], melds: &[&[Tile]]) -> bool { +pub(crate) fn check_wincon(_hand: &[Tile; 14], _melds: &[&[Tile]]) -> bool { // 4x3 + pair // assume sorted // diff --git a/jong/src/game/round.rs b/jong/src/game/round.rs index ceefc5b..031e8ed 100644 --- a/jong/src/game/round.rs +++ b/jong/src/game/round.rs @@ -1,17 +1,8 @@ -use std::rc::Weak; use bevy::{platform::collections::HashMap, prelude::*}; use strum::{EnumCount, FromRepr}; -use crate::{ - EnumNextCycle, - game::{ - GameState, - hand::{Discarded, Drawn, Hand, Pond}, - player::{CurrentPlayer, Player}, - wall::Wall, - }, -}; +use crate::EnumNextCycle; use jong_types::TurnState; // #[derive(Resource)] diff --git a/jong/src/main.rs b/jong/src/main.rs index b29e0e9..66cb09b 100644 --- a/jong/src/main.rs +++ b/jong/src/main.rs @@ -1,5 +1,4 @@ use bevy::{log::LogPlugin, prelude::*}; -use bevy_spacetimedb::{StdbConnection, StdbPlugin}; use clap::{Parser, Subcommand}; use tracing::Level; use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; @@ -42,7 +41,6 @@ fn main() { tui_logger::init_logger(tui_logger::LevelFilter::Trace).unwrap(); tui_logger::set_env_filter_from_string(FILTERSTRING); - // app.add_plugins(tui::RiichiTui) app.add_plugins(tui::TuiPlugin) } }; diff --git a/spacetimedb/src/lib.rs b/spacetimedb/src/lib.rs index 7853e13..4a1b889 100644 --- a/spacetimedb/src/lib.rs +++ b/spacetimedb/src/lib.rs @@ -1,5 +1,5 @@ -use log::{debug, info}; -use spacetimedb::{ReducerContext, Table, ViewContext, reducer, view}; +use log::debug; +use spacetimedb::{ReducerContext, Table, reducer}; use crate::tables::{player::player, *}; diff --git a/spacetimedb/src/reducers/game.rs b/spacetimedb/src/reducers/game.rs index 69cf86c..0519bd2 100644 --- a/spacetimedb/src/reducers/game.rs +++ b/spacetimedb/src/reducers/game.rs @@ -1,4 +1,4 @@ -use log::{info, trace}; +use log::info; use spacetimedb::{ReducerContext, Table, rand::seq::SliceRandom, reducer}; use crate::tables::{player::player, *}; diff --git a/spacetimedb/src/reducers/game/deal.rs b/spacetimedb/src/reducers/game/deal.rs index acc74a7..99069f6 100644 --- a/spacetimedb/src/reducers/game/deal.rs +++ b/spacetimedb/src/reducers/game/deal.rs @@ -1,8 +1,8 @@ -use log::{debug, trace}; +use log::debug; use spacetimedb::{ReducerContext, Table, rand::seq::SliceRandom, reducer}; use super::hand::deal_hands; -use crate::tables::{player::player, *}; +use crate::tables::*; use jong_types::*; #[reducer] diff --git a/spacetimedb/src/reducers/game/hand.rs b/spacetimedb/src/reducers/game/hand.rs index b1904bc..96fedb2 100644 --- a/spacetimedb/src/reducers/game/hand.rs +++ b/spacetimedb/src/reducers/game/hand.rs @@ -1,5 +1,5 @@ -use log::{debug, info, trace}; -use spacetimedb::{ReducerContext, Table, ViewContext, reducer, view}; +use log::{debug, trace}; +use spacetimedb::{ReducerContext, Table, reducer}; use crate::tables::{player::player, *}; use jong_types::*; @@ -80,7 +80,7 @@ pub fn discard_tile(ctx: &ReducerContext, tile_id: u32) -> Result<(), String> { pub fn skip_call(ctx: &ReducerContext) { trace!("skip_call"); - let mut player = ctx.db.player().identity().find(ctx.sender).unwrap(); + let player = ctx.db.player().identity().find(ctx.sender).unwrap(); let mut lobby = ctx.db.lobby().id().find(player.lobby_id).unwrap(); lobby.turn_state = TurnState::Tsumo; diff --git a/spacetimedb/src/tables.rs b/spacetimedb/src/tables.rs index 6288970..4295811 100644 --- a/spacetimedb/src/tables.rs +++ b/spacetimedb/src/tables.rs @@ -1,4 +1,4 @@ -use spacetimedb::{Filter, SpacetimeType, client_visibility_filter, table}; +use spacetimedb::table; use jong_types::*;