majjo/Pumpkin
1
0
Fork 0
mirror of https://github.com/Pumpkin-MC/Pumpkin.git synced 2026-08-30 20:14:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move assets folder outside of pumpkin-world

Browse Source
This commit is contained in:
lukas0008
2024-09-18 17:01:18 +02:00
parent cf62babfe4
commit ee7d652bf1
6 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
pumpkin-world/assets/blocks.json → assets/blocks.json
View File

0
pumpkin-world/assets/items.json → assets/items.json
View File

0
pumpkin-world/assets/registries.json → assets/registries.json
View File

2
pumpkin-world/src/block/block_registry.rs
View File

@@ -5,7 +5,7 @@ use serde::Deserialize;
use super::block_id::BlockId;
pub static BLOCKS: LazyLock<HashMap<String, RegistryBlockType>> = 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.")
});

2
pumpkin-world/src/global_registry.rs
View File

@@ -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 {

2
pumpkin-world/src/item/item_registry.rs
View File

@@ -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<HashMap<String, ItemElement>> = LazyLock::new(|| {
serde_json::from_str(ITEMS_JSON).expect("Could not parse items.json registry.")