Merge branch 'bedrock-crustaceans:proto_rework' into proto_rework

crates/addon/Cargo.toml

@@ -4,13 +4,16 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-bedrockrs_core = { path = "../core" }
-
 uuid = { version = "1.8", features = ["serde"] }
 semver = { version = "1.0", features = ["serde"] }
+
 image = "0.25"
-thiserror = "1.0"
+
+vek = "0.17"
+thiserror = "2.0"
+
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 json_comments = "0.2"
+
 walkdir = "2.5"

crates/addon/src/behavior/mod.rs

@@ -53,7 +53,7 @@ impl Addon for BehaviorPack {
         let blocks_path = path.join("blocks");
         let mut blocks = HashMap::new();
 
-        // If dir exists read all blocks
+        // If dir exists, read all blocks
         if blocks_path.is_dir() {
             'blocks_walk: for blocks_entry in WalkDir::new(&blocks_path).into_iter().filter(|v| {
                 if let Ok(v) = v {
@@ -88,7 +88,7 @@ impl Addon for BehaviorPack {
         let items_path = path.join("items");
         let mut items = HashMap::new();
 
-        // If dir exists read all items
+        // If dir exists, read all items
         if items_path.is_dir() {
             'items_walk: for items_entry in WalkDir::new(&items_path).into_iter().filter(|v| {
                 if let Ok(v) = v {
@@ -177,14 +177,14 @@ impl Addon for BehaviorPack {
         })
     }
 
-    fn export(path: impl AsRef<Path>) -> Result<Self, AddonError>
+    fn export(_path: impl AsRef<Path>) -> Result<Self, AddonError>
     where
         Self: Sized,
     {
         unimplemented!()
     }
 
-    fn merge(addons: Vec<Self>) -> Self
+    fn merge(_addons: Vec<Self>) -> Self
     where
         Self: Sized,
     {

crates/addon/src/language/code.rs

@@ -1,24 +1,10 @@
-use std::fmt::{Debug, Formatter};
+use std::fmt::Debug;
 
-use bedrockrs_core::Vec2;
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(untagged)]
 pub enum LanguageCode {
     VanillaCode(String),
-    CustomCode(Vec2<String>),
-}
-
-impl Debug for LanguageCode {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        match self {
-            LanguageCode::VanillaCode(v) => {
-                write!(f, "VanillaCode({v})")
-            }
-            LanguageCode::CustomCode(v) => {
-                write!(f, "CustomCode([{}, {}])", v.x, v.y)
-            }
-        }
-    }
+    CustomCode((String, String)),
 }

crates/addon/src/language/mod.rs

@@ -32,7 +32,7 @@ impl Languages {
             for language in languages_file {
                 let language_code = match language {
                     LanguageCode::VanillaCode(v) => v,
-                    LanguageCode::CustomCode(v) => v.x,
+                    LanguageCode::CustomCode(v) => v.1,
                 };
 
                 let language_path = languages_path.join(format!("{language_code}.lang"));

crates/addon/src/manifest.rs

@@ -1,4 +1,3 @@
-use bedrockrs_core::Vec3;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
@@ -40,9 +39,9 @@ pub struct AddonManifestHeader {
     /// For resource packs, an optional string that specifies whether this resource pack can be used across the game or at an individual world level. Valid values are "world", which specifies that a pack is only addable in the context of a world "global", which means that a pack is only addable across the game, and "any" which indicates that a pack can apply either across the game or to a specific world. If not specified, this is interpreted as "any".
     pub pack_scope: Option<String>,
     /// This is the version of the base game your world template requires, specified as [majorVersion, minorVersion, revision]. We use this to determine what version of the base game resource and behavior packs to apply when your content is used. (world template manifest JSON only)
-    pub base_game_version: Option<Vec3<u32>>,
+    pub base_game_version: Option<[u32; 3]>,
     /// This is the minimum version of the game that this pack was written for. This is a required field for resource and behavior packs. This helps the game identify whether any backwards compatibility is needed for your pack. You should always use the highest version currently available when creating packs.
-    pub min_engine_version: Option<Vec3<u32>>,
+    pub min_engine_version: Option<[u32; 3]>,
 }
 
 /// Section containing information regarding the type of content that is being brought in.
@@ -76,7 +75,7 @@ pub struct AddonManifestDependency {
 /// Section containing the metadata about the file such as authors and licensing information.
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct AddonManifestMetadata {
-    /// Name of the author(s) of the pack.
+    /// Name of the pack authors.
     pub authors: Option<Vec<String>>,
     /// The license of the pack.
     pub license: Option<String>,

crates/addon/src/resource/mod.rs

@@ -41,14 +41,14 @@ impl Addon for ResourcePack {
         })
     }
 
-    fn export(path: impl AsRef<Path>) -> Result<Self, AddonError>
+    fn export(_path: impl AsRef<Path>) -> Result<Self, AddonError>
     where
         Self: Sized,
     {
         unimplemented!()
     }
 
-    fn merge(addons: Vec<Self>) -> Self
+    fn merge(_addons: Vec<Self>) -> Self
     where
         Self: Sized,
     {

crates/addon/src/version.rs

@@ -1,21 +1,11 @@
-use std::fmt::{Debug, Formatter};
+use std::fmt::Debug;
 
-use bedrockrs_core::Vec3;
 use serde::{Deserialize, Serialize};
 
 /// A version used in Addons that is either a Vector [a, b, c] or SemVer String.
-#[derive(Serialize, Deserialize, Clone)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 #[serde(untagged)]
 pub enum AddonSemanticVersion {
-    Vector(Vec3<u32>),
+    Vector([u32; 3]),
     SemVer(semver::Version),
 }
-
-impl Debug for AddonSemanticVersion {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        match self {
-            AddonSemanticVersion::Vector(v) => f.debug_list().entries([v.x, v.y, v.z]).finish(),
-            AddonSemanticVersion::SemVer(v) => v.fmt(f),
-        }
-    }
-}

crates/core/Cargo.toml

@@ -4,10 +4,3 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-uuid = { version = "1.8", features = ["v4"] }
-
-bytes = "1.6"
-byteorder = "1.5"
-varint-rs = "2.2"
-
-serde = "1.0"

crates/core/src/lib.rs

@@ -1,4 +1 @@
-pub use vec::vec2::Vec2;
-pub use vec::vec3::Vec3;
 
-pub mod vec;