move all the crate dirs back under src/

6 months ago · d30a2bd3a3
123 changed files with 40 additions and 49 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@ -6,41 +6,41 @@ edition = "2021"

 [workspace]
 members = [
-    "client",
-    "drops",
-    "entity",
-    "items",
-    "location",
-    "maps",
-    "networking",
-    "pktbuilder",
-    "quests",
-    "room",
-    "shops",
-    "stats",
-    "trade",
-    "patch_server",
-    "login_server",
-    "ship_server",
+    "src/client",
+    "src/drops",
+    "src/entity",
+    "src/items",
+    "src/location",
+    "src/maps",
+    "src/networking",
+    "src/pktbuilder",
+    "src/quests",
+    "src/room",
+    "src/shops",
+    "src/stats",
+    "src/trade",
+    "src/patch_server",
+    "src/login_server",
+    "src/ship_server",
 ]

 [workspace.dependencies]
-entity = { path = "./entity" }
-maps = { path = "./maps" }
-networking = { path = "./networking" }
-shops = { path = "./shops" }
-stats = { path = "./stats" }
-items = { path = "./items" }
-pktbuilder = { path = "./pktbuilder" }
-quests = { path = "./quests" }
-location = { path = "./location" }
-client = { path = "./client" }
-drops = { path = "./drops" }
-trade = { path = "./trade" }
-room = { path = "./room" }
-patch_server = { path = "./patch_server" }
-login_server = { path = "./login_server" }
-ship_server = { path = "./ship_server" }
+entity = { path = "./src/entity" }
+maps = { path = "./src/maps" }
+networking = { path = "./src/networking" }
+shops = { path = "./src/shops" }
+stats = { path = "./src/stats" }
+items = { path = "./src/items" }
+pktbuilder = { path = "./src/pktbuilder" }
+quests = { path = "./src/quests" }
+location = { path = "./src/location" }
+client = { path = "./src/client" }
+drops = { path = "./src/drops" }
+trade = { path = "./src/trade" }
+room = { path = "./src/room" }
+patch_server = { path = "./src/patch_server" }
+login_server = { path = "./src/login_server" }
+ship_server = { path = "./src/ship_server" }

 libpso = { git = "http://git.sharnoth.com/jake/libpso" }

@ -76,32 +76,23 @@ anyhow = { version = "1.0.68", features = ["backtrace"] }
 entity = { workspace = true }
 maps = { workspace = true }
 networking = { workspace = true }
-shops = { workspace = true }
-stats = { workspace = true }
-items = { workspace = true }
-pktbuilder = { workspace = true }
-quests = { workspace = true }
-location = { workspace = true }
-client = { workspace = true }
-drops = { workspace = true }
-trade = { workspace = true }
-room = { workspace = true }
 patch_server = { workspace = true }
 login_server = { workspace = true }
 ship_server = { workspace = true }

 libpso = { workspace = true }

-anyhow = { workspace = true }
 async-std = { workspace = true }
-async-trait = { workspace = true }
 bcrypt = { workspace = true }
 chrono = { workspace = true }
-crc = { workspace = true }
 fern = { workspace = true }
 futures = { workspace = true }
 log = { workspace = true }
-rand = { workspace = true }
-ron = { workspace = true }
-serde = { workspace = true }
-thiserror = { workspace = true }
+
+[dev-dependencies]
+drops = { workspace = true }
+shops = { workspace = true }
+items = { workspace = true }
+quests = { workspace = true }
+stats = { workspace = true }
+async-trait = { workspace = true }
--- a/src/client/Cargo.toml
+++ b/src/client/Cargo.toml
--- a/src/client/src/lib.rs
+++ b/src/client/src/lib.rs
--- a/src/drops/Cargo.toml
+++ b/src/drops/Cargo.toml
--- a/src/drops/src/box_drop_table.rs
+++ b/src/drops/src/box_drop_table.rs
--- a/src/drops/src/generic_armor.rs
+++ b/src/drops/src/generic_armor.rs
--- a/src/drops/src/generic_shield.rs
+++ b/src/drops/src/generic_shield.rs
--- a/src/drops/src/generic_unit.rs
+++ b/src/drops/src/generic_unit.rs
--- a/src/drops/src/generic_weapon.rs
+++ b/src/drops/src/generic_weapon.rs
--- a/src/drops/src/lib.rs
+++ b/src/drops/src/lib.rs
--- a/src/drops/src/rare_drop_table.rs
+++ b/src/drops/src/rare_drop_table.rs
--- a/src/drops/src/tech_table.rs
+++ b/src/drops/src/tech_table.rs
--- a/src/drops/src/tool_table.rs
+++ b/src/drops/src/tool_table.rs
--- a/src/entity/Cargo.toml
+++ b/src/entity/Cargo.toml
--- a/src/entity/src/account.rs
+++ b/src/entity/src/account.rs
--- a/src/entity/src/character.rs
+++ b/src/entity/src/character.rs
--- a/src/entity/src/gateway/entitygateway.rs
+++ b/src/entity/src/gateway/entitygateway.rs
--- a/src/entity/src/gateway/inmemory.rs
+++ b/src/entity/src/gateway/inmemory.rs
--- a/src/entity/src/gateway/mod.rs
+++ b/src/entity/src/gateway/mod.rs
--- a/src/entity/src/gateway/postgres/migrations/V0001initial.sql
+++ b/src/entity/src/gateway/postgres/migrations/V0001initial.sql
--- a/src/entity/src/gateway/postgres/migrations/V0002equips.sql
+++ b/src/entity/src/gateway/postgres/migrations/V0002equips.sql
--- a/src/entity/src/gateway/postgres/migrations/V0003__item_notes.sql
+++ b/src/entity/src/gateway/postgres/migrations/V0003__item_notes.sql
--- a/src/entity/src/gateway/postgres/migrations/V0004meseta.sql
+++ b/src/entity/src/gateway/postgres/migrations/V0004meseta.sql
--- a/src/entity/src/gateway/postgres/migrations/V0005trade.sql
+++ b/src/entity/src/gateway/postgres/migrations/V0005trade.sql
--- a/src/entity/src/gateway/postgres/migrations/V0006playtime.sql
+++ b/src/entity/src/gateway/postgres/migrations/V0006playtime.sql
--- a/src/entity/src/gateway/postgres/migrations/V0007__player_keyconfig.sql
+++ b/src/entity/src/gateway/postgres/migrations/V0007__player_keyconfig.sql
--- a/src/entity/src/gateway/postgres/migrations/V0008__playtime_not_null.sql
+++ b/src/entity/src/gateway/postgres/migrations/V0008__playtime_not_null.sql
--- a/src/entity/src/gateway/postgres/migrations/V0009__no_player_keyconfig.sql
+++ b/src/entity/src/gateway/postgres/migrations/V0009__no_player_keyconfig.sql
--- a/src/entity/src/gateway/postgres/migrations/V0010__char_create_timestamp.sql
+++ b/src/entity/src/gateway/postgres/migrations/V0010__char_create_timestamp.sql
--- a/src/entity/src/gateway/postgres/migrations/V0011__shared_bank.sql
+++ b/src/entity/src/gateway/postgres/migrations/V0011__shared_bank.sql
--- a/src/entity/src/gateway/postgres/migrations/V0012room.sql
+++ b/src/entity/src/gateway/postgres/migrations/V0012room.sql
--- a/src/entity/src/gateway/postgres/migrations/V0013room2.sql
+++ b/src/entity/src/gateway/postgres/migrations/V0013room2.sql
--- a/src/entity/src/gateway/postgres/migrations/mod.rs
+++ b/src/entity/src/gateway/postgres/migrations/mod.rs
--- a/src/entity/src/gateway/postgres/mod.rs
+++ b/src/entity/src/gateway/postgres/mod.rs
--- a/src/entity/src/gateway/postgres/models.rs
+++ b/src/entity/src/gateway/postgres/models.rs
--- a/src/entity/src/gateway/postgres/postgres.rs
+++ b/src/entity/src/gateway/postgres/postgres.rs
--- a/src/entity/src/item/armor.rs
+++ b/src/entity/src/item/armor.rs
--- a/src/entity/src/item/esweapon.rs
+++ b/src/entity/src/item/esweapon.rs
--- a/src/entity/src/item/mag.rs
+++ b/src/entity/src/item/mag.rs
--- a/src/entity/src/item/mod.rs
+++ b/src/entity/src/item/mod.rs
--- a/src/entity/src/item/shield.rs
+++ b/src/entity/src/item/shield.rs
--- a/src/entity/src/item/tech.rs
+++ b/src/entity/src/item/tech.rs
--- a/src/entity/src/item/tool.rs
+++ b/src/entity/src/item/tool.rs
--- a/src/entity/src/item/unit.rs
+++ b/src/entity/src/item/unit.rs
--- a/src/entity/src/item/weapon.rs
+++ b/src/entity/src/item/weapon.rs
--- a/src/entity/src/lib.rs
+++ b/src/entity/src/lib.rs
--- a/src/entity/src/room.rs
+++ b/src/entity/src/room.rs
--- a/src/entity/src/team.rs
+++ b/src/entity/src/team.rs
--- a/src/items/Cargo.toml
+++ b/src/items/Cargo.toml
--- a/src/items/src/actions.rs
+++ b/src/items/src/actions.rs
--- a/src/items/src/apply_item.rs
+++ b/src/items/src/apply_item.rs
--- a/src/items/src/bank.rs
+++ b/src/items/src/bank.rs
--- a/src/items/src/floor.rs
+++ b/src/items/src/floor.rs
--- a/src/items/src/inventory.rs
+++ b/src/items/src/inventory.rs
--- a/src/items/src/itemstateaction.rs
+++ b/src/items/src/itemstateaction.rs
--- a/src/items/src/lib.rs
+++ b/src/items/src/lib.rs
--- a/src/items/src/manager.rs
+++ b/src/items/src/manager.rs
--- a/src/items/src/state.rs
+++ b/src/items/src/state.rs
--- a/src/items/src/tasks.rs
+++ b/src/items/src/tasks.rs
--- a/src/items/src/trade.rs
+++ b/src/items/src/trade.rs
--- a/src/location/Cargo.toml
+++ b/src/location/Cargo.toml
--- a/src/location/src/lib.rs
+++ b/src/location/src/lib.rs
--- a/src/login_server/Cargo.toml
+++ b/src/login_server/Cargo.toml
--- a/src/login_server/src/character.rs
+++ b/src/login_server/src/character.rs
--- a/src/login_server/src/lib.rs
+++ b/src/login_server/src/lib.rs
--- a/src/login_server/src/login.rs
+++ b/src/login_server/src/login.rs
--- a/src/maps/Cargo.toml
+++ b/src/maps/Cargo.toml
--- a/src/maps/src/area.rs
+++ b/src/maps/src/area.rs
--- a/src/maps/src/enemy.rs
+++ b/src/maps/src/enemy.rs
--- a/src/maps/src/lib.rs
+++ b/src/maps/src/lib.rs
--- a/src/maps/src/maps.rs
+++ b/src/maps/src/maps.rs
--- a/src/maps/src/monster.rs
+++ b/src/maps/src/monster.rs
--- a/src/maps/src/object.rs
+++ b/src/maps/src/object.rs
--- a/src/maps/src/room.rs
+++ b/src/maps/src/room.rs
--- a/src/maps/src/variant.rs
+++ b/src/maps/src/variant.rs
--- a/src/networking/Cargo.toml
+++ b/src/networking/Cargo.toml
--- a/src/networking/src/cipherkeys.rs
+++ b/src/networking/src/cipherkeys.rs
--- a/src/networking/src/interserver.rs
+++ b/src/networking/src/interserver.rs
--- a/src/networking/src/lib.rs
+++ b/src/networking/src/lib.rs
--- a/src/networking/src/mainloop/client.rs
+++ b/src/networking/src/mainloop/client.rs
--- a/src/networking/src/mainloop/interserver.rs
+++ b/src/networking/src/mainloop/interserver.rs
--- a/src/networking/src/mainloop/mod.rs
+++ b/src/networking/src/mainloop/mod.rs
--- a/src/networking/src/serverstate.rs
+++ b/src/networking/src/serverstate.rs
--- a/src/patch_server/Cargo.toml
+++ b/src/patch_server/Cargo.toml
--- a/src/patch_server/src/lib.rs
+++ b/src/patch_server/src/lib.rs
--- a/src/pktbuilder/Cargo.toml
+++ b/src/pktbuilder/Cargo.toml
--- a/src/pktbuilder/src/character.rs
+++ b/src/pktbuilder/src/character.rs
--- a/src/pktbuilder/src/lib.rs
+++ b/src/pktbuilder/src/lib.rs
--- a/src/pktbuilder/src/lobby.rs
+++ b/src/pktbuilder/src/lobby.rs
--- a/src/pktbuilder/src/message.rs
+++ b/src/pktbuilder/src/message.rs
--- a/src/pktbuilder/src/quest.rs
+++ b/src/pktbuilder/src/quest.rs
--- a/src/pktbuilder/src/room.rs
+++ b/src/pktbuilder/src/room.rs
--- a/src/pktbuilder/src/ship.rs
+++ b/src/pktbuilder/src/ship.rs
--- a/src/pktbuilder/src/team.rs
+++ b/src/pktbuilder/src/team.rs
--- a/src/pktbuilder/src/trade.rs
+++ b/src/pktbuilder/src/trade.rs
--- a/src/quests/Cargo.toml
+++ b/src/quests/Cargo.toml
--- a/src/quests/src/lib.rs
+++ b/src/quests/src/lib.rs
--- a/src/room/Cargo.toml
+++ b/src/room/Cargo.toml
--- a/src/room/src/lib.rs
+++ b/src/room/src/lib.rs
--- a/src/ship_server/Cargo.toml
+++ b/src/ship_server/Cargo.toml