cargo fmt
This commit is contained in:
parent
8f614e2f28
commit
8e940b7b0c
|
@ -314,14 +314,22 @@ impl Factory {
|
||||||
None => {
|
None => {
|
||||||
// 1.13+ paths remove implicit blocks/
|
// 1.13+ paths remove implicit blocks/
|
||||||
// TODO: remove fallback, look for specific asset version?
|
// 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,
|
Some(val) => val,
|
||||||
None => {
|
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;
|
return None;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
};
|
};
|
||||||
let block_model: serde_json::Value = try_log!(opt serde_json::from_reader(file));
|
let block_model: serde_json::Value = try_log!(opt serde_json::from_reader(file));
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,8 @@ use crate::types::hash::FNVHash;
|
||||||
use crate::ui;
|
use crate::ui;
|
||||||
|
|
||||||
const RESOURCES_VERSION: &str = "1.13.2";
|
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_VERSION: &str = "1.13.1";
|
||||||
const ASSET_INDEX_URL: &str = "https://launchermeta.mojang.com/mc/assets/1.13.1/1e710e31f3ce2fe262373b8cf5e054ee5955d904/1.13.1.json";
|
const ASSET_INDEX_URL: &str = "https://launchermeta.mojang.com/mc/assets/1.13.1/1e710e31f3ce2fe262373b8cf5e054ee5955d904/1.13.1.json";
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue