aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormat <github@matdoes.dev>2021-12-16 16:23:51 +0000
committermat <github@matdoes.dev>2021-12-16 16:23:51 +0000
commitc12469966e50fe9d269896687e3763cabb039d73 (patch)
tree9d537df4d475d296ef64d882a08be32efec6ef63
parent279ca8aeda2f8b8ba98ff969fc2801fc5df79167 (diff)
downloadazalea-drasl-c12469966e50fe9d269896687e3763cabb039d73.tar.xz
add resource location to azalea-core
-rw-r--r--azalea-core/src/lib.rs5
-rw-r--r--azalea-core/src/serializable_uuid.rs5
-rw-r--r--azalea-protocol/src/packets/login/clientbound_custom_query_packet.rs2
-rw-r--r--bot/src/main.rs2
4 files changed, 6 insertions, 8 deletions
diff --git a/azalea-core/src/lib.rs b/azalea-core/src/lib.rs
index 592988a3..dbe08afb 100644
--- a/azalea-core/src/lib.rs
+++ b/azalea-core/src/lib.rs
@@ -1,6 +1,7 @@
-//! Random miscellaneous things like UUIDs
+//! Random miscellaneous things like UUIDs that don't deserve their own crate.
-mod serializable_uuid;
+pub mod resource_location;
+pub mod serializable_uuid;
#[cfg(test)]
mod tests {
diff --git a/azalea-core/src/serializable_uuid.rs b/azalea-core/src/serializable_uuid.rs
index 91b5f2d8..473d8254 100644
--- a/azalea-core/src/serializable_uuid.rs
+++ b/azalea-core/src/serializable_uuid.rs
@@ -5,10 +5,6 @@ pub trait SerializableUuid {
fn from_int_array(array: [u32; 4]) -> Self;
}
-// private static int[] leastMostToIntArray(long l, long l2) {
-// return new int[]{(int)(l >> 32), (int)l, (int)(l2 >> 32), (int)l2};
-// }
-
fn least_most_to_int_array(most: u64, least: u64) -> [u32; 4] {
[
(most >> 32) as u32,
@@ -34,6 +30,7 @@ impl SerializableUuid for Uuid {
}
}
+#[cfg(tests)]
mod tests {
use super::*;
diff --git a/azalea-protocol/src/packets/login/clientbound_custom_query_packet.rs b/azalea-protocol/src/packets/login/clientbound_custom_query_packet.rs
index 093176eb..11ae6d4d 100644
--- a/azalea-protocol/src/packets/login/clientbound_custom_query_packet.rs
+++ b/azalea-protocol/src/packets/login/clientbound_custom_query_packet.rs
@@ -1,7 +1,7 @@
use std::hash::Hash;
use tokio::io::BufReader;
-use crate::mc_buf::{self, Readable, Writable};
+use crate::mc_buf::{Readable, Writable};
use super::LoginPacket;
diff --git a/bot/src/main.rs b/bot/src/main.rs
index 9cfd7f9a..4e7b3d75 100644
--- a/bot/src/main.rs
+++ b/bot/src/main.rs
@@ -2,7 +2,7 @@ use azalea_client::connect::join_server;
use tokio::runtime::Runtime;
async fn bot() {
- let address = "localhost:50388";
+ let address = "95.111.249.143:10000";
let _response = join_server(&address.try_into().unwrap()).await.unwrap();
// println!("{}", response.description.to_ansi(None));
println!("connected");