From ee7d652bf1f803d18c42ba134b921956971e11ca Mon Sep 17 00:00:00 2001 From: lukas0008 Date: Wed, 18 Sep 2024 17:01:18 +0200 Subject: [PATCH] Move assets folder outside of pumpkin-world --- {pumpkin-world/assets => assets}/blocks.json | 0 {pumpkin-world/assets => assets}/items.json | 0 {pumpkin-world/assets => assets}/registries.json | 0 pumpkin-world/src/block/block_registry.rs | 2 +- pumpkin-world/src/global_registry.rs | 2 +- pumpkin-world/src/item/item_registry.rs | 2 +- 6 files changed, 3 insertions(+), 3 deletions(-) rename {pumpkin-world/assets => assets}/blocks.json (100%) rename {pumpkin-world/assets => assets}/items.json (100%) rename {pumpkin-world/assets => assets}/registries.json (100%) diff --git a/pumpkin-world/assets/blocks.json b/assets/blocks.json similarity index 100% rename from pumpkin-world/assets/blocks.json rename to assets/blocks.json diff --git a/pumpkin-world/assets/items.json b/assets/items.json similarity index 100% rename from pumpkin-world/assets/items.json rename to assets/items.json diff --git a/pumpkin-world/assets/registries.json b/assets/registries.json similarity index 100% rename from pumpkin-world/assets/registries.json rename to assets/registries.json diff --git a/pumpkin-world/src/block/block_registry.rs b/pumpkin-world/src/block/block_registry.rs index 7d7b3f69f..cd06e98de 100644 --- a/pumpkin-world/src/block/block_registry.rs +++ b/pumpkin-world/src/block/block_registry.rs @@ -5,7 +5,7 @@ use serde::Deserialize; use super::block_id::BlockId; pub static BLOCKS: LazyLock> = LazyLock::new(|| { - serde_json::from_str(include_str!("../../assets/blocks.json")) + serde_json::from_str(include_str!("../../../assets/blocks.json")) .expect("Could not parse block.json registry.") }); diff --git a/pumpkin-world/src/global_registry.rs b/pumpkin-world/src/global_registry.rs index 19f8a6e6f..f822b57ab 100644 --- a/pumpkin-world/src/global_registry.rs +++ b/pumpkin-world/src/global_registry.rs @@ -2,7 +2,7 @@ use std::{collections::HashMap, sync::LazyLock}; pub const ITEM_REGISTRY: &str = "minecraft:item"; -const REGISTRY_JSON: &str = include_str!("../assets/registries.json"); +const REGISTRY_JSON: &str = include_str!("../../assets/registries.json"); #[derive(serde::Deserialize, Debug, Clone, PartialEq, Eq)] pub struct RegistryElement { diff --git a/pumpkin-world/src/item/item_registry.rs b/pumpkin-world/src/item/item_registry.rs index f91dd300c..756c30b4e 100644 --- a/pumpkin-world/src/item/item_registry.rs +++ b/pumpkin-world/src/item/item_registry.rs @@ -3,7 +3,7 @@ use std::{collections::HashMap, sync::LazyLock}; use super::Rarity; use crate::global_registry::{self, ITEM_REGISTRY}; -const ITEMS_JSON: &str = include_str!("../../assets/items.json"); +const ITEMS_JSON: &str = include_str!("../../../assets/items.json"); pub static ITEMS: LazyLock> = LazyLock::new(|| { serde_json::from_str(ITEMS_JSON).expect("Could not parse items.json registry.")