diff --git a/blocks/src/lib.rs b/blocks/src/lib.rs index 01ff0f39..50169f2a 100644 --- a/blocks/src/lib.rs +++ b/blocks/src/lib.rs @@ -212,8 +212,9 @@ macro_rules! define_blocks { Block::$name { $($fname,)? } => { - $(return String::from($variant);)? - "normal".to_owned() + $(return String::from($variant);)* + //"normal".to_owned() + "".to_owned() } )+ } @@ -5258,7 +5259,7 @@ define_blocks! { }, data Some(facing.horizontal_index()), offset Some(facing.horizontal_offset()), - model { ("minecraft", "silver_glazed_terracotta") }, + model { ("minecraft", "light_gray_glazed_terracotta") }, variant format!("facing={}", facing.as_string()), } CyanGlazedTerracotta { diff --git a/resources/assets/steven/blockstates/missing_block.json b/resources/assets/steven/blockstates/missing_block.json index 4458eecb..34a4e38a 100644 --- a/resources/assets/steven/blockstates/missing_block.json +++ b/resources/assets/steven/blockstates/missing_block.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "missing_block" } + "": { "model": "missing_block" } } } diff --git a/src/model/mod.rs b/src/model/mod.rs index f08fe3d1..20dd6c20 100644 --- a/src/model/mod.rs +++ b/src/model/mod.rs @@ -312,11 +312,23 @@ impl Factory { { Some(val) => val, None => { - error!( - "Couldn't find model {}", - format!("models/block/{}.json", model_name) - ); - return None; + // 1.13+ paths remove implicit blocks/ + // TODO: remove fallback, look for specific asset version? + match self + .resources + .read() + .unwrap() + .open(plugin, &format!("models/{}.json", model_name)) + { + Some(val) => val, + None => { + error!( + "Couldn't find model models/block/{}.json or models/{}.json", + model_name, model_name + ); + return None; + } + } } }; let block_model: serde_json::Value = try_log!(opt serde_json::from_reader(file)); diff --git a/src/resources.rs b/src/resources.rs index 2163e9a1..ed4e6906 100644 --- a/src/resources.rs +++ b/src/resources.rs @@ -26,11 +26,11 @@ use std_or_web::fs; use crate::types::hash::FNVHash; use crate::ui; -const RESOURCES_VERSION: &str = "1.12.2"; +const RESOURCES_VERSION: &str = "1.13.2"; const VANILLA_CLIENT_URL: &str = - "https://launcher.mojang.com/v1/objects/0f275bc1547d01fa5f56ba34bdc87d981ee12daf/client.jar"; -const ASSET_VERSION: &str = "1.12"; -const ASSET_INDEX_URL: &str = "https://launchermeta.mojang.com/mc/assets/1.12/67e29e024e664064c1f04c728604f83c24cbc218/1.12.json"; + "https://launcher.mojang.com/v1/objects/30bfe37a8db404db11c7edf02cb5165817afb4d9/client.jar"; +const ASSET_VERSION: &str = "1.13.1"; +const ASSET_INDEX_URL: &str = "https://launchermeta.mojang.com/mc/assets/1.13.1/1e710e31f3ce2fe262373b8cf5e054ee5955d904/1.13.1.json"; pub trait Pack: Sync + Send { fn open(&self, name: &str) -> Option>;