From 1b1300e1940b15dfdcc969ddc32555b6c98c2c3a Mon Sep 17 00:00:00 2001 From: Edvin Bryntesson Date: Tue, 20 Aug 2024 12:31:46 +0200 Subject: [PATCH] make registries public --- pumpkin-world/src/block/block_registry.rs | 8 ++++---- pumpkin-world/src/block/mod.rs | 2 +- pumpkin-world/src/item/item_registry.rs | 4 ++-- pumpkin-world/src/item/mod.rs | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pumpkin-world/src/block/block_registry.rs b/pumpkin-world/src/block/block_registry.rs index e44de5042..f694bdcac 100644 --- a/pumpkin-world/src/block/block_registry.rs +++ b/pumpkin-world/src/block/block_registry.rs @@ -7,28 +7,28 @@ use crate::world::WorldError; const BLOCKS_JSON: &str = include_str!("../../assets/blocks.json"); #[derive(serde::Deserialize, Debug, Clone, PartialEq, Eq)] -struct BlockDefinition { +pub struct BlockDefinition { #[serde(rename = "type")] kind: String, block_set_type: Option, } #[derive(serde::Deserialize, Debug, Clone, PartialEq, Eq)] -struct BlockState { +pub struct BlockState { default: Option, id: i64, properties: Option>, } #[derive(serde::Deserialize, Debug, Clone, PartialEq, Eq)] -struct BlocksElement { +pub struct BlocksElement { definition: BlockDefinition, properties: Option>>, states: Vec, } lazy_static! { - static ref BLOCKS: HashMap = + pub static ref BLOCKS: HashMap = serde_json::from_str(BLOCKS_JSON).expect("Could not parse block.json registry."); } diff --git a/pumpkin-world/src/block/mod.rs b/pumpkin-world/src/block/mod.rs index 6840d84d5..1009f9fe3 100644 --- a/pumpkin-world/src/block/mod.rs +++ b/pumpkin-world/src/block/mod.rs @@ -3,7 +3,7 @@ use num_derive::FromPrimitive; use crate::vector3::Vector3; pub mod block_registry; - +pub use block_registry::BLOCKS; #[derive(FromPrimitive)] pub enum BlockFace { Bottom = 0, diff --git a/pumpkin-world/src/item/item_registry.rs b/pumpkin-world/src/item/item_registry.rs index 278d793fa..b521fd56b 100644 --- a/pumpkin-world/src/item/item_registry.rs +++ b/pumpkin-world/src/item/item_registry.rs @@ -23,12 +23,12 @@ pub struct ItemComponents { } #[derive(serde::Deserialize, Debug, Clone, PartialEq, Eq)] -struct ItemElement { +pub struct ItemElement { components: ItemComponents, } lazy_static! { - static ref ITEMS: HashMap = + pub static ref ITEMS: HashMap = serde_json::from_str(ITEMS_JSON).expect("Could not parse items.json registry."); } diff --git a/pumpkin-world/src/item/mod.rs b/pumpkin-world/src/item/mod.rs index c0e119074..0fa843d57 100644 --- a/pumpkin-world/src/item/mod.rs +++ b/pumpkin-world/src/item/mod.rs @@ -1,6 +1,6 @@ mod item_registry; mod item_categories; - +pub use item_registry::ITEMS; #[derive(serde::Deserialize, Debug, Clone, PartialEq, Eq)] #[serde(rename_all = "lowercase")] /// Item Rarity