From f69a4743145b036106b5668381ce5f1b6ab4e104 Mon Sep 17 00:00:00 2001 From: Jonni Liljamo Date: Thu, 16 Feb 2023 16:52:20 +0200 Subject: [PATCH] chore(client): rename sdbclient to client --- Cargo.lock | 38 +++++++++--------- Cargo.toml | 2 +- {sdbclient => client}/.gitignore | 0 {sdbclient => client}/Cargo.toml | 4 +- {sdbclient => client}/LICENSE | 4 +- {sdbclient => client}/README.md | 0 .../assets/branding/logo.png | Bin .../assets/fonts/FiraMono-Bold.ttf | Bin .../assets/fonts/FiraMono-Medium.ttf | Bin .../assets/fonts/FiraMono-Regular.ttf | Bin {sdbclient => client}/assets/fonts/OFL.txt | 0 .../assets/scripts/ui_play.lua | 0 {sdbclient => client}/assets/ui.ess | 0 .../src/api/game/all_forming.rs | 0 {sdbclient => client}/src/api/game/create.rs | 0 {sdbclient => client}/src/api/game/info.rs | 0 {sdbclient => client}/src/api/game/join.rs | 0 {sdbclient => client}/src/api/game/mod.rs | 0 {sdbclient => client}/src/api/game/mygames.rs | 0 .../src/api/game/patchstate.rs | 0 {sdbclient => client}/src/api/game/types.rs | 0 {sdbclient => client}/src/api/mod.rs | 0 {sdbclient => client}/src/api/user/mod.rs | 0 {sdbclient => client}/src/api/user/types.rs | 0 {sdbclient => client}/src/cfg/mod.rs | 0 {sdbclient => client}/src/constants.rs | 0 {sdbclient => client}/src/lua/mod.rs | 0 {sdbclient => client}/src/main.rs | 0 .../src/plugins/config/mod.rs | 0 .../src/plugins/connection_check/mod.rs | 0 .../src/plugins/menu/accountlogin/mod.rs | 0 .../src/plugins/menu/accountlogin/ui.rs | 0 .../src/plugins/menu/accountregister/mod.rs | 0 .../src/plugins/menu/accountregister/ui.rs | 0 .../src/plugins/menu/accountscreenloggedin.rs | 0 .../plugins/menu/accountscreenloggedout.rs | 0 .../src/plugins/menu/mainmenuscreen.rs | 0 {sdbclient => client}/src/plugins/menu/mod.rs | 0 .../src/plugins/menu/play/allformingcall.rs | 0 .../src/plugins/menu/play/creategamecall.rs | 0 .../src/plugins/menu/play/joingamecall.rs | 0 .../src/plugins/menu/play/mod.rs | 0 .../src/plugins/menu/play/mygamescall.rs | 0 .../src/plugins/menu/play/startgamecall.rs | 0 .../src/plugins/menu/play/ui.rs | 0 .../src/plugins/menu/settingsscreen.rs | 0 {sdbclient => client}/src/plugins/mod.rs | 0 .../src/plugins/phases/loading/mod.rs | 0 .../src/plugins/phases/mod.rs | 0 .../src/plugins/phases/splash/mod.rs | 0 {sdbclient => client}/src/runtime/game/mod.rs | 0 {sdbclient => client}/src/runtime/menu/mod.rs | 0 {sdbclient => client}/src/runtime/mod.rs | 0 {sdbclient => client}/src/util/eguipwd.rs | 0 {sdbclient => client}/src/util/mod.rs | 0 {sdbclient => client}/src/util/sl.rs | 0 server/Cargo.toml | 8 ++++ server/src/main.rs | 3 ++ 58 files changed, 35 insertions(+), 24 deletions(-) rename {sdbclient => client}/.gitignore (100%) rename {sdbclient => client}/Cargo.toml (95%) rename {sdbclient => client}/LICENSE (85%) rename {sdbclient => client}/README.md (100%) rename {sdbclient => client}/assets/branding/logo.png (100%) rename {sdbclient => client}/assets/fonts/FiraMono-Bold.ttf (100%) rename {sdbclient => client}/assets/fonts/FiraMono-Medium.ttf (100%) rename {sdbclient => client}/assets/fonts/FiraMono-Regular.ttf (100%) rename {sdbclient => client}/assets/fonts/OFL.txt (100%) rename {sdbclient => client}/assets/scripts/ui_play.lua (100%) rename {sdbclient => client}/assets/ui.ess (100%) rename {sdbclient => client}/src/api/game/all_forming.rs (100%) rename {sdbclient => client}/src/api/game/create.rs (100%) rename {sdbclient => client}/src/api/game/info.rs (100%) rename {sdbclient => client}/src/api/game/join.rs (100%) rename {sdbclient => client}/src/api/game/mod.rs (100%) rename {sdbclient => client}/src/api/game/mygames.rs (100%) rename {sdbclient => client}/src/api/game/patchstate.rs (100%) rename {sdbclient => client}/src/api/game/types.rs (100%) rename {sdbclient => client}/src/api/mod.rs (100%) rename {sdbclient => client}/src/api/user/mod.rs (100%) rename {sdbclient => client}/src/api/user/types.rs (100%) rename {sdbclient => client}/src/cfg/mod.rs (100%) rename {sdbclient => client}/src/constants.rs (100%) rename {sdbclient => client}/src/lua/mod.rs (100%) rename {sdbclient => client}/src/main.rs (100%) rename {sdbclient => client}/src/plugins/config/mod.rs (100%) rename {sdbclient => client}/src/plugins/connection_check/mod.rs (100%) rename {sdbclient => client}/src/plugins/menu/accountlogin/mod.rs (100%) rename {sdbclient => client}/src/plugins/menu/accountlogin/ui.rs (100%) rename {sdbclient => client}/src/plugins/menu/accountregister/mod.rs (100%) rename {sdbclient => client}/src/plugins/menu/accountregister/ui.rs (100%) rename {sdbclient => client}/src/plugins/menu/accountscreenloggedin.rs (100%) rename {sdbclient => client}/src/plugins/menu/accountscreenloggedout.rs (100%) rename {sdbclient => client}/src/plugins/menu/mainmenuscreen.rs (100%) rename {sdbclient => client}/src/plugins/menu/mod.rs (100%) rename {sdbclient => client}/src/plugins/menu/play/allformingcall.rs (100%) rename {sdbclient => client}/src/plugins/menu/play/creategamecall.rs (100%) rename {sdbclient => client}/src/plugins/menu/play/joingamecall.rs (100%) rename {sdbclient => client}/src/plugins/menu/play/mod.rs (100%) rename {sdbclient => client}/src/plugins/menu/play/mygamescall.rs (100%) rename {sdbclient => client}/src/plugins/menu/play/startgamecall.rs (100%) rename {sdbclient => client}/src/plugins/menu/play/ui.rs (100%) rename {sdbclient => client}/src/plugins/menu/settingsscreen.rs (100%) rename {sdbclient => client}/src/plugins/mod.rs (100%) rename {sdbclient => client}/src/plugins/phases/loading/mod.rs (100%) rename {sdbclient => client}/src/plugins/phases/mod.rs (100%) rename {sdbclient => client}/src/plugins/phases/splash/mod.rs (100%) rename {sdbclient => client}/src/runtime/game/mod.rs (100%) rename {sdbclient => client}/src/runtime/menu/mod.rs (100%) rename {sdbclient => client}/src/runtime/mod.rs (100%) rename {sdbclient => client}/src/util/eguipwd.rs (100%) rename {sdbclient => client}/src/util/mod.rs (100%) rename {sdbclient => client}/src/util/sl.rs (100%) create mode 100644 server/Cargo.toml create mode 100644 server/src/main.rs diff --git a/Cargo.lock b/Cargo.lock index 4cc2cf0..90ddc4f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1230,6 +1230,25 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "client" +version = "0.1.0" +dependencies = [ + "belly", + "bevy", + "bevy-inspector-egui", + "bevy_console", + "directories", + "futures-lite", + "iyes_loopless", + "proc-macro2", + "reqwest", + "serde", + "serde_json", + "serde_repr", + "toml 0.7.1", +] + [[package]] name = "clipboard-win" version = "4.4.2" @@ -3647,25 +3666,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" -[[package]] -name = "sdbclient" -version = "0.1.0" -dependencies = [ - "belly", - "bevy", - "bevy-inspector-egui", - "bevy_console", - "directories", - "futures-lite", - "iyes_loopless", - "proc-macro2", - "reqwest", - "serde", - "serde_json", - "serde_repr", - "toml 0.7.1", -] - [[package]] name = "security-framework" version = "2.7.0" diff --git a/Cargo.toml b/Cargo.toml index 53d7b19..19805d8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,5 +2,5 @@ resolver = "2" members = [ - "sdbclient" + "client" ] diff --git a/sdbclient/.gitignore b/client/.gitignore similarity index 100% rename from sdbclient/.gitignore rename to client/.gitignore diff --git a/sdbclient/Cargo.toml b/client/Cargo.toml similarity index 95% rename from sdbclient/Cargo.toml rename to client/Cargo.toml index 9bd7e4a..ad7cec0 100644 --- a/sdbclient/Cargo.toml +++ b/client/Cargo.toml @@ -1,11 +1,11 @@ [package] -name = "sdbclient" +name = "client" version = "0.1.0" authors = ["Jonni Liljamo "] edition = "2021" description = "Client for a deck building game" readme = "README.md" -repository = "https://src.quest/skye/deck-builder" +repository = "https://git.src.quest/~skye/deck-builder/" license = "GPL-3.0-only" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/sdbclient/LICENSE b/client/LICENSE similarity index 85% rename from sdbclient/LICENSE rename to client/LICENSE index 1f48461..b4d6889 100644 --- a/sdbclient/LICENSE +++ b/client/LICENSE @@ -1,5 +1,5 @@ -sdbclient is a client for a deck building game. -Copyright (C) 2022 Jonni Liljamo +A client for a deck building game. +Copyright (C) 2023 Jonni Liljamo This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/sdbclient/README.md b/client/README.md similarity index 100% rename from sdbclient/README.md rename to client/README.md diff --git a/sdbclient/assets/branding/logo.png b/client/assets/branding/logo.png similarity index 100% rename from sdbclient/assets/branding/logo.png rename to client/assets/branding/logo.png diff --git a/sdbclient/assets/fonts/FiraMono-Bold.ttf b/client/assets/fonts/FiraMono-Bold.ttf similarity index 100% rename from sdbclient/assets/fonts/FiraMono-Bold.ttf rename to client/assets/fonts/FiraMono-Bold.ttf diff --git a/sdbclient/assets/fonts/FiraMono-Medium.ttf b/client/assets/fonts/FiraMono-Medium.ttf similarity index 100% rename from sdbclient/assets/fonts/FiraMono-Medium.ttf rename to client/assets/fonts/FiraMono-Medium.ttf diff --git a/sdbclient/assets/fonts/FiraMono-Regular.ttf b/client/assets/fonts/FiraMono-Regular.ttf similarity index 100% rename from sdbclient/assets/fonts/FiraMono-Regular.ttf rename to client/assets/fonts/FiraMono-Regular.ttf diff --git a/sdbclient/assets/fonts/OFL.txt b/client/assets/fonts/OFL.txt similarity index 100% rename from sdbclient/assets/fonts/OFL.txt rename to client/assets/fonts/OFL.txt diff --git a/sdbclient/assets/scripts/ui_play.lua b/client/assets/scripts/ui_play.lua similarity index 100% rename from sdbclient/assets/scripts/ui_play.lua rename to client/assets/scripts/ui_play.lua diff --git a/sdbclient/assets/ui.ess b/client/assets/ui.ess similarity index 100% rename from sdbclient/assets/ui.ess rename to client/assets/ui.ess diff --git a/sdbclient/src/api/game/all_forming.rs b/client/src/api/game/all_forming.rs similarity index 100% rename from sdbclient/src/api/game/all_forming.rs rename to client/src/api/game/all_forming.rs diff --git a/sdbclient/src/api/game/create.rs b/client/src/api/game/create.rs similarity index 100% rename from sdbclient/src/api/game/create.rs rename to client/src/api/game/create.rs diff --git a/sdbclient/src/api/game/info.rs b/client/src/api/game/info.rs similarity index 100% rename from sdbclient/src/api/game/info.rs rename to client/src/api/game/info.rs diff --git a/sdbclient/src/api/game/join.rs b/client/src/api/game/join.rs similarity index 100% rename from sdbclient/src/api/game/join.rs rename to client/src/api/game/join.rs diff --git a/sdbclient/src/api/game/mod.rs b/client/src/api/game/mod.rs similarity index 100% rename from sdbclient/src/api/game/mod.rs rename to client/src/api/game/mod.rs diff --git a/sdbclient/src/api/game/mygames.rs b/client/src/api/game/mygames.rs similarity index 100% rename from sdbclient/src/api/game/mygames.rs rename to client/src/api/game/mygames.rs diff --git a/sdbclient/src/api/game/patchstate.rs b/client/src/api/game/patchstate.rs similarity index 100% rename from sdbclient/src/api/game/patchstate.rs rename to client/src/api/game/patchstate.rs diff --git a/sdbclient/src/api/game/types.rs b/client/src/api/game/types.rs similarity index 100% rename from sdbclient/src/api/game/types.rs rename to client/src/api/game/types.rs diff --git a/sdbclient/src/api/mod.rs b/client/src/api/mod.rs similarity index 100% rename from sdbclient/src/api/mod.rs rename to client/src/api/mod.rs diff --git a/sdbclient/src/api/user/mod.rs b/client/src/api/user/mod.rs similarity index 100% rename from sdbclient/src/api/user/mod.rs rename to client/src/api/user/mod.rs diff --git a/sdbclient/src/api/user/types.rs b/client/src/api/user/types.rs similarity index 100% rename from sdbclient/src/api/user/types.rs rename to client/src/api/user/types.rs diff --git a/sdbclient/src/cfg/mod.rs b/client/src/cfg/mod.rs similarity index 100% rename from sdbclient/src/cfg/mod.rs rename to client/src/cfg/mod.rs diff --git a/sdbclient/src/constants.rs b/client/src/constants.rs similarity index 100% rename from sdbclient/src/constants.rs rename to client/src/constants.rs diff --git a/sdbclient/src/lua/mod.rs b/client/src/lua/mod.rs similarity index 100% rename from sdbclient/src/lua/mod.rs rename to client/src/lua/mod.rs diff --git a/sdbclient/src/main.rs b/client/src/main.rs similarity index 100% rename from sdbclient/src/main.rs rename to client/src/main.rs diff --git a/sdbclient/src/plugins/config/mod.rs b/client/src/plugins/config/mod.rs similarity index 100% rename from sdbclient/src/plugins/config/mod.rs rename to client/src/plugins/config/mod.rs diff --git a/sdbclient/src/plugins/connection_check/mod.rs b/client/src/plugins/connection_check/mod.rs similarity index 100% rename from sdbclient/src/plugins/connection_check/mod.rs rename to client/src/plugins/connection_check/mod.rs diff --git a/sdbclient/src/plugins/menu/accountlogin/mod.rs b/client/src/plugins/menu/accountlogin/mod.rs similarity index 100% rename from sdbclient/src/plugins/menu/accountlogin/mod.rs rename to client/src/plugins/menu/accountlogin/mod.rs diff --git a/sdbclient/src/plugins/menu/accountlogin/ui.rs b/client/src/plugins/menu/accountlogin/ui.rs similarity index 100% rename from sdbclient/src/plugins/menu/accountlogin/ui.rs rename to client/src/plugins/menu/accountlogin/ui.rs diff --git a/sdbclient/src/plugins/menu/accountregister/mod.rs b/client/src/plugins/menu/accountregister/mod.rs similarity index 100% rename from sdbclient/src/plugins/menu/accountregister/mod.rs rename to client/src/plugins/menu/accountregister/mod.rs diff --git a/sdbclient/src/plugins/menu/accountregister/ui.rs b/client/src/plugins/menu/accountregister/ui.rs similarity index 100% rename from sdbclient/src/plugins/menu/accountregister/ui.rs rename to client/src/plugins/menu/accountregister/ui.rs diff --git a/sdbclient/src/plugins/menu/accountscreenloggedin.rs b/client/src/plugins/menu/accountscreenloggedin.rs similarity index 100% rename from sdbclient/src/plugins/menu/accountscreenloggedin.rs rename to client/src/plugins/menu/accountscreenloggedin.rs diff --git a/sdbclient/src/plugins/menu/accountscreenloggedout.rs b/client/src/plugins/menu/accountscreenloggedout.rs similarity index 100% rename from sdbclient/src/plugins/menu/accountscreenloggedout.rs rename to client/src/plugins/menu/accountscreenloggedout.rs diff --git a/sdbclient/src/plugins/menu/mainmenuscreen.rs b/client/src/plugins/menu/mainmenuscreen.rs similarity index 100% rename from sdbclient/src/plugins/menu/mainmenuscreen.rs rename to client/src/plugins/menu/mainmenuscreen.rs diff --git a/sdbclient/src/plugins/menu/mod.rs b/client/src/plugins/menu/mod.rs similarity index 100% rename from sdbclient/src/plugins/menu/mod.rs rename to client/src/plugins/menu/mod.rs diff --git a/sdbclient/src/plugins/menu/play/allformingcall.rs b/client/src/plugins/menu/play/allformingcall.rs similarity index 100% rename from sdbclient/src/plugins/menu/play/allformingcall.rs rename to client/src/plugins/menu/play/allformingcall.rs diff --git a/sdbclient/src/plugins/menu/play/creategamecall.rs b/client/src/plugins/menu/play/creategamecall.rs similarity index 100% rename from sdbclient/src/plugins/menu/play/creategamecall.rs rename to client/src/plugins/menu/play/creategamecall.rs diff --git a/sdbclient/src/plugins/menu/play/joingamecall.rs b/client/src/plugins/menu/play/joingamecall.rs similarity index 100% rename from sdbclient/src/plugins/menu/play/joingamecall.rs rename to client/src/plugins/menu/play/joingamecall.rs diff --git a/sdbclient/src/plugins/menu/play/mod.rs b/client/src/plugins/menu/play/mod.rs similarity index 100% rename from sdbclient/src/plugins/menu/play/mod.rs rename to client/src/plugins/menu/play/mod.rs diff --git a/sdbclient/src/plugins/menu/play/mygamescall.rs b/client/src/plugins/menu/play/mygamescall.rs similarity index 100% rename from sdbclient/src/plugins/menu/play/mygamescall.rs rename to client/src/plugins/menu/play/mygamescall.rs diff --git a/sdbclient/src/plugins/menu/play/startgamecall.rs b/client/src/plugins/menu/play/startgamecall.rs similarity index 100% rename from sdbclient/src/plugins/menu/play/startgamecall.rs rename to client/src/plugins/menu/play/startgamecall.rs diff --git a/sdbclient/src/plugins/menu/play/ui.rs b/client/src/plugins/menu/play/ui.rs similarity index 100% rename from sdbclient/src/plugins/menu/play/ui.rs rename to client/src/plugins/menu/play/ui.rs diff --git a/sdbclient/src/plugins/menu/settingsscreen.rs b/client/src/plugins/menu/settingsscreen.rs similarity index 100% rename from sdbclient/src/plugins/menu/settingsscreen.rs rename to client/src/plugins/menu/settingsscreen.rs diff --git a/sdbclient/src/plugins/mod.rs b/client/src/plugins/mod.rs similarity index 100% rename from sdbclient/src/plugins/mod.rs rename to client/src/plugins/mod.rs diff --git a/sdbclient/src/plugins/phases/loading/mod.rs b/client/src/plugins/phases/loading/mod.rs similarity index 100% rename from sdbclient/src/plugins/phases/loading/mod.rs rename to client/src/plugins/phases/loading/mod.rs diff --git a/sdbclient/src/plugins/phases/mod.rs b/client/src/plugins/phases/mod.rs similarity index 100% rename from sdbclient/src/plugins/phases/mod.rs rename to client/src/plugins/phases/mod.rs diff --git a/sdbclient/src/plugins/phases/splash/mod.rs b/client/src/plugins/phases/splash/mod.rs similarity index 100% rename from sdbclient/src/plugins/phases/splash/mod.rs rename to client/src/plugins/phases/splash/mod.rs diff --git a/sdbclient/src/runtime/game/mod.rs b/client/src/runtime/game/mod.rs similarity index 100% rename from sdbclient/src/runtime/game/mod.rs rename to client/src/runtime/game/mod.rs diff --git a/sdbclient/src/runtime/menu/mod.rs b/client/src/runtime/menu/mod.rs similarity index 100% rename from sdbclient/src/runtime/menu/mod.rs rename to client/src/runtime/menu/mod.rs diff --git a/sdbclient/src/runtime/mod.rs b/client/src/runtime/mod.rs similarity index 100% rename from sdbclient/src/runtime/mod.rs rename to client/src/runtime/mod.rs diff --git a/sdbclient/src/util/eguipwd.rs b/client/src/util/eguipwd.rs similarity index 100% rename from sdbclient/src/util/eguipwd.rs rename to client/src/util/eguipwd.rs diff --git a/sdbclient/src/util/mod.rs b/client/src/util/mod.rs similarity index 100% rename from sdbclient/src/util/mod.rs rename to client/src/util/mod.rs diff --git a/sdbclient/src/util/sl.rs b/client/src/util/sl.rs similarity index 100% rename from sdbclient/src/util/sl.rs rename to client/src/util/sl.rs diff --git a/server/Cargo.toml b/server/Cargo.toml new file mode 100644 index 0000000..dd022ab --- /dev/null +++ b/server/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "server" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] diff --git a/server/src/main.rs b/server/src/main.rs new file mode 100644 index 0000000..e7a11a9 --- /dev/null +++ b/server/src/main.rs @@ -0,0 +1,3 @@ +fn main() { + println!("Hello, world!"); +} -- 2.44.1