From a3e26b38bd147efea16d592536aaece37e3e2741 Mon Sep 17 00:00:00 2001 From: mat Date: Sun, 8 May 2022 19:00:51 -0500 Subject: fix saving being slow --- azalea-language/src/lib.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'azalea-language/src') diff --git a/azalea-language/src/lib.rs b/azalea-language/src/lib.rs index 3647d4c7..7aa91405 100644 --- a/azalea-language/src/lib.rs +++ b/azalea-language/src/lib.rs @@ -1,5 +1,5 @@ use lazy_static::lazy_static; -use std::collections::HashMap; +use std::{collections::HashMap, fs::File}; // use tokio::fs::File; @@ -29,8 +29,13 @@ use std::collections::HashMap; // The code above is kept in case I come up with a better solution lazy_static! { - pub static ref STORAGE: HashMap = - serde_json::from_str(include_str!("en_us.json")).unwrap(); + pub static ref STORAGE: HashMap = serde_json::from_str({ + let mut file = File::open("en_us.json").unwrap(); + let mut contents = String::new(); + file.read_to_string(&mut contents).unwrap(); + contents + }) + .unwrap(); } pub fn get(key: &str) -> Option<&str> { -- cgit v1.2.3 From 718bea869679a73a256edcb1a1349625218d2e34 Mon Sep 17 00:00:00 2001 From: mat Date: Sun, 8 May 2022 19:02:01 -0500 Subject: fix the fix --- azalea-language/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'azalea-language/src') diff --git a/azalea-language/src/lib.rs b/azalea-language/src/lib.rs index 7aa91405..c0ac4c4f 100644 --- a/azalea-language/src/lib.rs +++ b/azalea-language/src/lib.rs @@ -1,6 +1,6 @@ use lazy_static::lazy_static; +use std::io::Read; use std::{collections::HashMap, fs::File}; - // use tokio::fs::File; // pub struct Language { @@ -29,7 +29,7 @@ use std::{collections::HashMap, fs::File}; // The code above is kept in case I come up with a better solution lazy_static! { - pub static ref STORAGE: HashMap = serde_json::from_str({ + pub static ref STORAGE: HashMap = serde_json::from_str(&{ let mut file = File::open("en_us.json").unwrap(); let mut contents = String::new(); file.read_to_string(&mut contents).unwrap(); -- cgit v1.2.3 From 122693a654b0c851bbb9e134c539961419175bef Mon Sep 17 00:00:00 2001 From: mat Date: Sun, 8 May 2022 19:19:20 -0500 Subject: actually actually fix --- azalea-language/src/lib.rs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'azalea-language/src') diff --git a/azalea-language/src/lib.rs b/azalea-language/src/lib.rs index c0ac4c4f..b48a0a6b 100644 --- a/azalea-language/src/lib.rs +++ b/azalea-language/src/lib.rs @@ -1,5 +1,6 @@ use lazy_static::lazy_static; use std::io::Read; +use std::path::Path; use std::{collections::HashMap, fs::File}; // use tokio::fs::File; @@ -30,7 +31,9 @@ use std::{collections::HashMap, fs::File}; lazy_static! { pub static ref STORAGE: HashMap = serde_json::from_str(&{ - let mut file = File::open("en_us.json").unwrap(); + let src_dir = Path::new(concat!(env!("CARGO_MANIFEST_DIR"), "/src/en_us.json")); + println!("dir: {:?}", src_dir); + let mut file = File::open(src_dir).unwrap(); let mut contents = String::new(); file.read_to_string(&mut contents).unwrap(); contents @@ -41,3 +44,13 @@ lazy_static! { pub fn get(key: &str) -> Option<&str> { STORAGE.get(key).map(|s| s.as_str()) } + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_get() { + assert_eq!(get("translation.test.none"), Some("Hello, world!")); + } +} -- cgit v1.2.3 From 7c194fb245fac1c52fbb9e4ca042dd5c42d522b6 Mon Sep 17 00:00:00 2001 From: mat Date: Sat, 14 May 2022 11:20:33 -0500 Subject: remove some printlns --- azalea-language/src/lib.rs | 1 - azalea-world/src/bit_storage.rs | 1 - azalea-world/src/palette.rs | 1 - bot/src/main.rs | 2 +- 4 files changed, 1 insertion(+), 4 deletions(-) (limited to 'azalea-language/src') diff --git a/azalea-language/src/lib.rs b/azalea-language/src/lib.rs index b48a0a6b..f54de3cb 100644 --- a/azalea-language/src/lib.rs +++ b/azalea-language/src/lib.rs @@ -32,7 +32,6 @@ use std::{collections::HashMap, fs::File}; lazy_static! { pub static ref STORAGE: HashMap = serde_json::from_str(&{ let src_dir = Path::new(concat!(env!("CARGO_MANIFEST_DIR"), "/src/en_us.json")); - println!("dir: {:?}", src_dir); let mut file = File::open(src_dir).unwrap(); let mut contents = String::new(); file.read_to_string(&mut contents).unwrap(); diff --git a/azalea-world/src/bit_storage.rs b/azalea-world/src/bit_storage.rs index 211a4a04..3f810f40 100644 --- a/azalea-world/src/bit_storage.rs +++ b/azalea-world/src/bit_storage.rs @@ -113,7 +113,6 @@ impl BitStorage { let values_per_long = 64 / bits; let magic_index = values_per_long - 1; let (divide_mul, divide_add, divide_shift) = MAGIC[magic_index as usize]; - println!("values_per_long: {}, size: {}", values_per_long, size); let calculated_length = (size + values_per_long - 1) / values_per_long; let mask = (1 << bits) - 1; diff --git a/azalea-world/src/palette.rs b/azalea-world/src/palette.rs index c33992b1..55a33bde 100644 --- a/azalea-world/src/palette.rs +++ b/azalea-world/src/palette.rs @@ -41,7 +41,6 @@ impl PalettedContainer { bits_per_entry != 0 || data.is_empty(), "Bits per entry is 0 but data is not empty." ); - println!("data: {:?}", data); let storage = BitStorage::new(bits_per_entry.into(), size, Some(data)).unwrap(); Ok(PalettedContainer { diff --git a/bot/src/main.rs b/bot/src/main.rs index 2686636b..2f9fb9e6 100644 --- a/bot/src/main.rs +++ b/bot/src/main.rs @@ -6,7 +6,7 @@ async fn main() { println!("Hello, world!"); // let address = "95.111.249.143:10000"; - let address = "172.23.192.1:61385"; + let address = "192.168.2.234:62840"; // let response = azalea_client::ping::ping_server(&address.try_into().unwrap()) // .await // .unwrap(); -- cgit v1.2.3