Merge branch 'feather-rs:main' into blockbreak

koskja · web-flow · commit 144f9f1dff0f · 2022-01-18T11:25:20.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/feather/base/src/anvil/level.rs b/feather/base/src/anvil/level.rs
@@ -164,7 +164,7 @@ impl LevelData {
         match self.generator_name.to_lowercase().as_str() {
             "default" => LevelGeneratorType::Default,
             "flat" => LevelGeneratorType::Flat,
-            "largeBiomes" => LevelGeneratorType::LargeBiomes,
+            "largebiomes" => LevelGeneratorType::LargeBiomes,
             "amplified" => LevelGeneratorType::Amplified,
             "buffet" => LevelGeneratorType::Buffet,
             "debug_all_block_states" => LevelGeneratorType::Debug,
diff --git a/feather/datapacks/Cargo.toml b/feather/datapacks/Cargo.toml
@@ -13,4 +13,4 @@ serde_json = "1"
 smartstring = { version = "0.2", features = [ "serde" ] }
 thiserror = "1"
 ureq = { version = "2", default-features = false, features = [ "tls" ] }
-zip = "0.5"
+zip = { version = "0.5", default-features = false, features = [ "deflate", "bzip2" ] }
diff --git a/feather/plugin-host/Cargo.toml b/feather/plugin-host/Cargo.toml
@@ -24,7 +24,7 @@ serde = "1"
 tempfile = "3"
 vec-arena = "1"
 wasmer = { version = "2", default-features = false, features = [ "jit" ] }
-wasmer-wasi = { version = "2", default-features = false }
+wasmer-wasi = { version = "2", default-features = false, features = [ "host-fs", "sys" ] }
 
 [features]
 llvm = [ "wasmer/llvm" ]
diff --git a/feather/protocol/src/packets/client/play.rs b/feather/protocol/src/packets/client/play.rs
@@ -106,9 +106,9 @@ def_enum! {
         0 = Interact,
         1 = Attack,
         2 = InteractAt {
-            target_x f64;
-            target_y f64;
-            target_z f64;
+            target_x f32;
+            target_y f32;
+            target_z f32;
             hand VarInt;
         },
     }
diff --git a/feather/server/Cargo.toml b/feather/server/Cargo.toml
@@ -17,7 +17,7 @@ ahash = "0.7"
 anyhow = "1"
 base = { path = "../base", package = "feather-base" }
 base64 = "0.13"
-chrono = "0.4"
+time = { version = "0.3", features = ["local-offset", "formatting", "macros"] }
 colored = "2"
 common = { path = "../common", package = "feather-common" }
 crossbeam-utils = "0.8"
@@ -36,10 +36,14 @@ parking_lot = "0.11"
 plugin-host = { path = "../plugin-host", package = "feather-plugin-host" }
 protocol = { path = "../protocol", package = "feather-protocol" }
 quill-common = { path = "../../quill/common" }
-rand = "0.7"
+
+rand = "0.8"
 ring = "0.16"
-rsa = "0.3"
-rsa-der = "0.2"
+
+rsa = "0.5"
+rsa-der = "0.3"
+base64ct = "1"
+
 serde = { version = "1", features = [ "derive" ] }
 serde_json = "1"
 sha-1 = "0.9"
diff --git a/feather/server/src/initial_handler.rs b/feather/server/src/initial_handler.rs
@@ -19,7 +19,7 @@ use protocol::{
     ServerLoginPacket, ServerPlayPacket, ServerStatusPacket,
 };
 use rand::rngs::OsRng;
-use rsa::{PaddingScheme, PublicKeyParts, RSAPrivateKey};
+use rsa::{PaddingScheme, PublicKeyParts, RsaPrivateKey};
 use serde::{Deserialize, Serialize};
 use sha1::Sha1;
 use std::convert::TryInto;
@@ -205,8 +205,8 @@ fn offline_mode_uuid(username: &str) -> Uuid {
 const RSA_BITS: usize = 1024;
 
 /// Cached RSA key used by this server instance.
-static RSA_KEY: Lazy<RSAPrivateKey> =
-    Lazy::new(|| RSAPrivateKey::new(&mut OsRng, RSA_BITS).expect("failed to create RSA key"));
+static RSA_KEY: Lazy<RsaPrivateKey> =
+    Lazy::new(|| RsaPrivateKey::new(&mut OsRng, RSA_BITS).expect("failed to create RSA key"));
 static RSA_KEY_ENCODED: Lazy<Vec<u8>> = Lazy::new(|| {
     rsa_der::public_key_to_der(&RSA_KEY.n().to_bytes_be(), &RSA_KEY.e().to_bytes_be())
 });
diff --git a/feather/server/src/logging.rs b/feather/server/src/logging.rs
@@ -1,5 +1,7 @@
 use colored::Colorize;
 use log::{Level, LevelFilter};
+use time::macros::format_description;
+use time::OffsetDateTime;
 
 pub fn init(level: LevelFilter) {
     fern::Dispatch::new()
@@ -16,9 +18,18 @@ pub fn init(level: LevelFilter) {
             } else {
                 record.module_path().unwrap_or_default()
             };
+
+            let datetime: OffsetDateTime = match OffsetDateTime::now_local() {
+                Ok(x) => x,
+                Err(_) => OffsetDateTime::now_utc(),
+            };
             out.finish(format_args!(
                 "{} {:<5} [{}] {}",
-                chrono::Local::now().format("%Y-%m-%d %H:%M:%S,%3f"),
+                datetime
+                    .format(format_description!(
+                        "[year]-[month]-[day] [hour]:[minute]:[second],[subsecond digits:3]"
+                    ))
+                    .unwrap(),
                 level_string,
                 target,
                 message,
diff --git a/feather/utils/Cargo.toml b/feather/utils/Cargo.toml
@@ -7,4 +7,3 @@ edition = "2018"
 [dependencies]
 
 [dev-dependencies]
-simple_logger = "1"
diff --git a/tools/proxy/Cargo.toml b/tools/proxy/Cargo.toml
@@ -12,5 +12,8 @@ futures-lite = "1"
 argh = "0.1"
 anyhow = "1"
 log = "0.4"
-simple_logger = "1"
 either = "1"
+colored = "2"
+fern = "0.6"
+time = { version = "0.3", features = ["local-offset", "formatting", "macros"] }
+
diff --git a/tools/proxy/src/logging.rs b/tools/proxy/src/logging.rs
@@ -0,0 +1,42 @@
+use colored::Colorize;
+use log::{Level, LevelFilter};
+use time::macros::format_description;
+use time::OffsetDateTime;
+
+pub fn init(level: LevelFilter) {
+    fern::Dispatch::new()
+        .format(|out, message, record| {
+            let level_string = match record.level() {
+                Level::Error => record.level().to_string().red(),
+                Level::Warn => record.level().to_string().yellow(),
+                Level::Info => record.level().to_string().cyan(),
+                Level::Debug => record.level().to_string().purple(),
+                Level::Trace => record.level().to_string().normal(),
+            };
+            let target = if !record.target().is_empty() {
+                record.target()
+            } else {
+                record.module_path().unwrap_or_default()
+            };
+
+            let datetime: OffsetDateTime = match OffsetDateTime::now_local() {
+                Ok(x) => x,
+                Err(_) => OffsetDateTime::now_utc(),
+            };
+            out.finish(format_args!(
+                "{} {:<5} [{}] {}",
+                datetime
+                    .format(format_description!(
+                        "[year]-[month]-[day] [hour]:[minute]:[second],[subsecond digits:3]"
+                    ))
+                    .unwrap(),
+                level_string,
+                target,
+                message,
+            ));
+        })
+        .level(level)
+        .chain(std::io::stdout())
+        .apply()
+        .unwrap();
+}
diff --git a/tools/proxy/src/main.rs b/tools/proxy/src/main.rs
@@ -1,5 +1,7 @@
 use std::net::{SocketAddr, TcpListener, TcpStream};
 
+mod logging;
+
 use anyhow::{bail, Context};
 use argh::FromArgs;
 use async_executor::Executor;
@@ -11,7 +13,6 @@ use feather_protocol::{
 };
 use futures_lite::FutureExt;
 use futures_lite::{AsyncReadExt, AsyncWriteExt};
-use simple_logger::SimpleLogger;
 
 /// A proxy for debugging and inspecting the Minecraft protocol.
 #[derive(Debug, FromArgs)]
@@ -26,10 +27,7 @@ struct Args {
 }
 
 fn main() -> anyhow::Result<()> {
-    SimpleLogger::new()
-        .with_level(log::LevelFilter::Debug)
-        .init()
-        .unwrap();
+    logging::init(log::LevelFilter::Debug);
     let args: Args = argh::from_env();
 
     let addr = format!("127.0.0.1:{}", args.port);

Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,3 @@ edition = "2018"`
`7`	`7`	`[dependencies]`
`8`	`8`
`9`	`9`	`[dev-dependencies]`
`10`		`-simple_logger = "1"`