.drone.yml

@@ -12,6 +12,8 @@ steps:
   volumes:
   - name: cache
     path: /usr/local/cargo
+  - name: target-cache
+    path: /drone/src/target
   commands:
   - cargo build
 - name: clippy!
@@ -19,6 +21,8 @@ steps:
   volumes:
   - name: cache
     path: /usr/local/cargo
+  - name: target-cache
+    path: /drone/src/target
   commands:
   - cargo clippy -- --deny warnings
 - name: test
@@ -26,6 +30,8 @@ steps:
   volumes:
   - name: cache
     path: /usr/local/cargo
+  - name: target-cache
+    path: /drone/src/target
   commands:
   - cargo test --jobs 1
 

src/common/mod.rs

@@ -1,6 +1,7 @@
 pub mod cipherkeys;
 pub mod serverstate;
 pub mod mainloop;
+pub mod leveltable;
 pub mod interserver;
 
 // https://www.reddit.com/r/rust/comments/33xhhu/how_to_create_an_array_of_structs_that_havent/

src/login/character.rs

@@ -18,7 +18,7 @@ use entity::item;
 use crate::common::cipherkeys::{ELSEWHERE_PRIVATE_KEY, ELSEWHERE_PARRAY};
 use crate::common::serverstate::{SendServerPacket, RecvServerPacket, ServerState, OnConnect, ClientId};
 use crate::common::interserver::{ServerId, InterserverActor, LoginMessage, ShipMessage, Ship};
-use stats::leveltable::LEVEL_TABLE;
+use crate::common::leveltable::LEVEL_TABLE;
 use libpso::{utf8_to_array, utf8_to_utf16_array};
 
 use entity::gateway::{EntityGateway, GatewayError};

src/ship/character.rs

@@ -1,5 +1,5 @@
 use libpso::character::character;
-use stats::leveltable::CharacterStats;
+use crate::common::leveltable::CharacterStats;
 use entity::character::CharacterEntity;
 //use crate::ship::items::{CharacterInventory, CharacterBank};
 use crate::ship::items::bank::BankState;

src/ship/packet/builder/message.rs

@@ -1,7 +1,7 @@
 use libpso::packet::messages::*;
 use libpso::packet::ship::*;
 use entity::item;
-use stats::leveltable::CharacterStats;
+use crate::common::leveltable::CharacterStats;
 use crate::ship::ship::{ShipError};
 use crate::ship::items::ClientItemId;
 use crate::ship::items::inventory::InventoryItem;

src/ship/packet/builder/mod.rs

@@ -6,7 +6,7 @@ pub mod ship;
 
 use libpso::character::character::Inventory;
 use libpso::packet::ship::{PlayerHeader, PlayerInfo};
-use stats::leveltable::LEVEL_TABLE;
+use crate::common::leveltable::LEVEL_TABLE;
 use crate::ship::character::CharacterBytesBuilder;
 use crate::ship::ship::ClientState;
 use crate::ship::location::AreaClient;

src/ship/packet/handler/direct_message.rs

@@ -3,7 +3,7 @@ use rand::Rng;
 use rand::seq::SliceRandom;
 use libpso::packet::ship::*;
 use libpso::packet::messages::*;
-use stats::leveltable::LEVEL_TABLE;
+use crate::common::leveltable::LEVEL_TABLE;
 use crate::common::serverstate::ClientId;
 use crate::ship::ship::{SendShipPacket, ShipError, Clients, ItemShops};
 use crate::ship::location::ClientLocation;

src/ship/packet/handler/lobby.rs

@@ -1,6 +1,6 @@
 use libpso::packet::ship::*;
 use crate::common::serverstate::ClientId;
-use stats::leveltable::LEVEL_TABLE;
+use crate::common::leveltable::LEVEL_TABLE;
 use crate::ship::ship::{SendShipPacket, ShipError, Clients, ShipEvent};
 use crate::ship::room::Rooms;
 use crate::ship::character::{FullCharacterBytesBuilder};

src/ship/packet/handler/message.rs

@@ -3,7 +3,7 @@ use libpso::packet::messages::*;
 use entity::gateway::EntityGateway;
 use entity::item::Meseta;
 use crate::common::serverstate::ClientId;
-use stats::leveltable::LEVEL_TABLE;
+use crate::common::leveltable::LEVEL_TABLE;
 use crate::ship::ship::{SendShipPacket, ShipError, Clients, ItemDropLocation};
 use crate::ship::room::Rooms;
 use crate::ship::location::{ClientLocation, ClientLocationError};

src/ship/packet/handler/room.rs

@@ -6,7 +6,7 @@ use async_std::sync::Arc;
 use libpso::packet::ship::*;
 use libpso::packet::messages::*;
 use crate::common::serverstate::ClientId;
-use stats::leveltable::LEVEL_TABLE;
+use crate::common::leveltable::LEVEL_TABLE;
 use entity::gateway::EntityGateway;
 use entity::character::SectionID;
 use entity::room::{NewRoomEntity, RoomEntityMode, RoomNote};

stats/Cargo.toml

@@ -7,5 +7,4 @@ edition = "2021"
 entity = { workspace = true }
 toml = { workspace = true }
 serde  = { workspace = true }
-serde_json  = { workspace = true }
 lazy_static = { workspace = true }

stats/src/lib.rs

@@ -1,4 +1 @@
-#![feature(lazy_cell)]
-
 pub mod items;
-pub mod leveltable;