From 8e940b7b0cfa57d60fd377e161609733496a5ad3 Mon Sep 17 00:00:00 2001 From: ice_iix Date: Wed, 6 Jan 2021 19:04:39 -0800 Subject: [PATCH] cargo fmt --- src/model/mod.rs | 14 +++++++++++--- src/resources.rs | 3 ++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/model/mod.rs b/src/model/mod.rs index 0a03a2a..20dd6c2 100644 --- a/src/model/mod.rs +++ b/src/model/mod.rs @@ -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)); diff --git a/src/resources.rs b/src/resources.rs index abbe306..ed4e690 100644 --- a/src/resources.rs +++ b/src/resources.rs @@ -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";