Datapack parsing

.gitignore

@@ -7,6 +7,8 @@
 .cargo
 
 world/
+feather/downloaded
+feather/datapacks/minecraft/
 /config.toml
 
 # Python cache files (libcraft)

feather/blocks/src/lib.rs

@@ -94,7 +94,6 @@ impl BlockId {
         VANILLA_ID_TABLE[self.kind as u16 as usize][self.state as usize]
     }
 
-    /*
     /// Returns the vanilla fluid ID for this block in case it is a fluid.
     /// The fluid ID is used in the Tags packet.
     pub fn vanilla_fluid_id(self) -> Option<u16> {
@@ -112,7 +111,6 @@ impl BlockId {
             None
         }
     }
-    */
 
     /// Returns the block corresponding to the given vanilla ID.
     ///

feather/common/Cargo.toml

@@ -22,4 +22,5 @@ uuid = { version = "0.8", features = [ "v4" ] }
 libcraft-core = { path = "../../libcraft/core" }
 rayon = "1.5"
 worldgen = { path = "../worldgen", package = "feather-worldgen" }
+datapacks = { path = "../datapacks", package = "feather-datapacks" }
 rand = "0.8"

feather/common/src/game.rs

@@ -1,6 +1,7 @@
 use std::{cell::RefCell, mem, rc::Rc, sync::Arc};
 
 use base::{BlockId, BlockPosition, ChunkPosition, Position, Text, Title};
+use datapacks::{RecipeRegistry, TagRegistry};
 use ecs::{
     Ecs, Entity, EntityBuilder, HasEcs, HasResources, NoSuchEntity, Resources, SysResult,
     SystemExecutor,
@@ -54,6 +55,10 @@ pub struct Game {
     entity_spawn_callbacks: Vec<EntitySpawnCallback>,
 
     entity_builder: EntityBuilder,
+
+    pub tag_registry: TagRegistry,
+
+    pub recipe_registry: RecipeRegistry,
 }
 
 impl Default for Game {
@@ -74,6 +79,8 @@ impl Game {
             tick_count: 0,
             entity_spawn_callbacks: Vec::new(),
             entity_builder: EntityBuilder::new(),
+            tag_registry: TagRegistry::new(),
+            recipe_registry: RecipeRegistry::new(),
         }
     }
 

feather/datapacks/Cargo.toml

@@ -1,16 +1,21 @@
 [package]
 name = "feather-datapacks"
 version = "0.1.0"
-authors = [ "caelunshun <[email protected]>" ]
+authors = [ "koskja <[email protected]>", "caelunshun <[email protected]>" ]
 edition = "2018"
 
 [dependencies]
 ahash = "0.4"
-anyhow = "1"
 log = "0.4"
 serde = { version = "1", features = [ "derive" ] }
 serde_json = "1"
 smartstring = { version = "0.2", features = [ "serde" ] }
 thiserror = "1"
-ureq = { version = "2", default-features = false, features = [ "tls" ] }
-zip = "0.5"
+generated = { path = "../generated", package = "feather-generated" }
+blocks = { path = "../blocks", package = "feather-blocks"}
+protocol = { path = "../protocol", package = "feather-protocol" }
+walkdir = "2.3.2"
+
+[build-dependencies]
+vanilla-assets = { path = "./vanilla_assets", package = "feather-vanilla-assets" }
+anyhow = "1"

feather/datapacks/build.rs

@@ -0,0 +1,8 @@
+use std::path::PathBuf;
+
+fn main() -> anyhow::Result<()> {
+    if !PathBuf::from("./minecraft").exists() {
+        vanilla_assets::download_vanilla_assets(&PathBuf::from("../"))?;
+    }
+    Ok(())
+}

feather/datapacks/src/id.rs

@@ -29,6 +29,20 @@ impl NamespacedId {
     pub fn name(&self) -> &str {
         &self.name
     }
+
+    pub fn from_parts(namespace: &str, name: &str) -> Result<Self, ParseError> {
+        let namespace = if namespace.is_empty() {
+            DEFAULT_NAMESPACE
+        } else {
+            namespace
+        };
+        validate_namespace(namespace)?;
+        validate_name(name)?;
+        Ok(Self {
+            namespace: SmartString::from(namespace),
+            name: SmartString::from(name),
+        })
+    }
 }
 
 /// Error returned when a namespaced ID was formatted incorrectly.

feather/datapacks/src/lib.rs

@@ -6,19 +6,55 @@
 //! This crate also downloads vanilla JARs and assets
 //! at startup; see `download_vanilla_assets`.
 
+use std::path::Path;
+
 use ahash::AHashMap;
+use id::ParseError;
 use serde::Deserialize;
 use smartstring::{LazyCompact, SmartString};
 
-mod vanilla;
-pub use vanilla::download_vanilla_assets;
-
 mod id;
 pub use id::NamespacedId;
 
+mod serde_helpers;
+pub(crate) use serde_helpers::*;
+
+pub mod tag;
+use tag::LoopError;
+pub use tag::{TagRegistry, TagRegistryBuilder};
+
+pub mod recipe;
+pub use recipe::RecipeRegistry;
+
 /// The default namespace for resource locations (NamespacedIds).
 pub const DEFAULT_NAMESPACE: &str = "minecraft";
 
+use thiserror::Error;
+#[derive(Error, Debug)]
+pub enum TagLoadError {
+    #[error("invalid namespaced id: {0}")]
+    Parse(#[from] ParseError),
+    #[error(transparent)]
+    Io(#[from] std::io::Error),
+    #[error("io error: {0}")]
+    WalkDir(#[from] walkdir::Error),
+    #[error("loop detected when parsing tags: {0}")]
+    FoundLoop(#[from] LoopError),
+    #[error("invalid tag link: {0} references {1}")]
+    InvalidLink(NamespacedId, NamespacedId),
+    #[error("json parsing error: {0}")]
+    Json(#[from] serde_json::Error),
+}
+#[derive(Error, Debug)]
+pub enum RecipeLoadError {
+    #[error("invalid namespaced id: {0}")]
+    Parse(#[from] ParseError),
+    #[error(transparent)]
+    Io(#[from] std::io::Error),
+    #[error("json parsing error: {0}")]
+    Json(#[from] serde_json::Error),
+}
+
 /// The pack.mcmeta file at the root of a datapack.
 ///
 /// Formatted with JSON.
@@ -33,3 +69,23 @@ pub struct Datapacks {
     /// The metadata of loaded packs. Keyed by the datapack name.
     _meta: AHashMap<SmartString<LazyCompact>, PackMeta>,
 }
+#[derive(Default)]
+pub struct Datapack {
+    pub advancements: (),
+    pub loot_tables: (),
+    pub recipes: (),
+    pub structures: (),
+    pub tags: TagRegistry,
+}
+
+impl Datapack {
+    pub fn new() -> Self {
+        Self {
+            ..Default::default()
+        }
+    }
+    pub fn from_folder(dir: &Path) -> Self {
+        assert!(dir.is_dir(), "not a directory");
+        todo!()
+    }
+}