done style

rimecraft-rs · Nov 11, 2023 · 1d1ec0d · 1d1ec0d
1 parent 248e657
commit 1d1ec0d
Show file tree

Hide file tree

Showing 7 changed files with 352 additions and 109 deletions.
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 rimecraft-primitives = { path = "../primitives", features = [
     "serde",
-    "edcode"
+    "edcode",
 ] }
 rimecraft-caches = { path = "../util/caches", features = ["arc"] }
 rimecraft-collections = { path = "../util/collections", features = [
@@ -26,7 +26,7 @@ serde_json = "1.0"
 toml = "0.8"
 uuid = { version = "1.4", features = ["v3", "v4"] }
 md-5 = "0.10"
-url = "2.4"
+url = { version = "2.4", features = ["serde"] }
 sysinfo = "0.29"
 bytes = "1.4"
 glam = "0.24"

diff --git a/core/src/text/click_event.rs b/core/src/text/click_event.rs
diff --git a/core/src/text/hover_event.rs b/core/src/text/hover_event.rs
@@ -10,6 +10,7 @@ use std::{
     collections::HashMap,
     fmt::Debug,
     hash::{Hash, Hasher},
+    sync::Arc,
 };
 
 #[derive(thiserror::Error, Debug)]
@@ -28,8 +29,9 @@ rimecraft_primitives::update_trait_object!(UpdDebug);
 /// # MCJE Reference
 ///
 /// This type represents `net.minecraft.text.HoverEvent` (yarn).
+#[derive(Clone)]
 pub struct HoverEvent {
-    contents: Box<dyn UpdDebug + Send + Sync>,
+    contents: Arc<dyn UpdDebug + Send + Sync>,
     action: &'static ErasedAction,
 }
 
@@ -40,7 +42,7 @@ impl HoverEvent {
         T: ErasedSerDeUpdate + Debug + Hash + Send + Sync + 'static,
     {
         Self {
-            contents: Box::new(contents),
+            contents: Arc::new(contents),
             action: ErasedAction::from_name(action.name)
                 .ok_or(Error::ActionNotRegistered(action.name))
                 .unwrap(),
@@ -129,7 +131,7 @@ impl<'de> Deserialize<'de> for HoverEvent {
             .map_err(D::Error::custom)?;
 
         Ok(Self {
-            contents: contents_obj,
+            contents: contents_obj.into(),
             action,
         })
     }