mirrors/stevenarella
mirrors
/
stevenarella
mirror of https://github.com/iceiix/stevenarella.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

cargo fmt

This commit is contained in:
ice_iix 2021-01-06 19:04:39 -08:00
parent 8f614e2f28
commit 8e940b7b0c
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/model/mod.rs
View File

@ -314,14 +314,22 @@ impl Factory {
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)) {
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);
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));

3
src/resources.rs
View File

@ -27,7 +27,8 @@ use crate::types::hash::FNVHash;
use crate::ui;
const RESOURCES_VERSION: &str = "1.13.2";
const VANILLA_CLIENT_URL: &str = "https://launcher.mojang.com/v1/objects/30bfe37a8db404db11c7edf02cb5165817afb4d9/client.jar";
const VANILLA_CLIENT_URL: &str =
"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";