From 03c8262c51e2d432f9daabb531e41327a3f8922f Mon Sep 17 00:00:00 2001 From: ice_iix Date: Sun, 16 Dec 2018 17:33:19 -0800 Subject: [PATCH 1/5] Update resources to 1.13.2 (uses 1.13.1 assets) --- src/resources.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/resources.rs b/src/resources.rs index b5dbb693..52afe973 100644 --- a/src/resources.rs +++ b/src/resources.rs @@ -30,10 +30,10 @@ use zip; use crate::types::hash::FNVHash; use crate::ui; -const RESOURCES_VERSION: &str = "1.12.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"; +const RESOURCES_VERSION: &str = "1.13.2"; +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"; pub trait Pack: Sync + Send { fn open(&self, name: &str) -> Option>; From a2a117b206cc545caca5d8200bf85404f3ccb88e Mon Sep 17 00:00:00 2001 From: ice_iix Date: Mon, 24 Dec 2018 09:32:19 -0800 Subject: [PATCH 2/5] Support explicit blocks/ paths in model, fallback for 1.13 --- src/model/mod.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/model/mod.rs b/src/model/mod.rs index 097e4b28..1d7e95c9 100644 --- a/src/model/mod.rs +++ b/src/model/mod.rs @@ -278,8 +278,15 @@ impl Factory { let file = match self.resources.read().unwrap().open(plugin, &format!("models/block/{}.json", model_name)) { 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)); From 60e8b98c18aa2a65b7d4f54a0b0a75f656bd5124 Mon Sep 17 00:00:00 2001 From: ice_iix Date: Sat, 22 Dec 2018 14:36:47 -0800 Subject: [PATCH 3/5] Glazed terra cotta silver -> light_gray in 1.13 https://minecraft.gamepedia.com/Glazed_Terracotta#History > The ID has now been changed from silver_glazed_terracotta to light_gray_glazed_terracotta. --- blocks/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blocks/src/lib.rs b/blocks/src/lib.rs index 53c0dd83..5a7fc292 100644 --- a/blocks/src/lib.rs +++ b/blocks/src/lib.rs @@ -5143,7 +5143,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 { From 60705a4125dc6fc39fbdeb2300c486a81a54d349 Mon Sep 17 00:00:00 2001 From: ice_iix Date: Mon, 24 Dec 2018 16:52:14 -0800 Subject: [PATCH 4/5] Change default variant from 'normal' to '' --- blocks/src/lib.rs | 3 ++- resources/assets/steven/blockstates/missing_block.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/blocks/src/lib.rs b/blocks/src/lib.rs index 5a7fc292..4fe72d12 100644 --- a/blocks/src/lib.rs +++ b/blocks/src/lib.rs @@ -177,7 +177,8 @@ macro_rules! define_blocks { $($fname,)* } => { $(return String::from($variant);)* - "normal".to_owned() + //"normal".to_owned() + "".to_owned() } )+ } 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" } } } From 8e940b7b0cfa57d60fd377e161609733496a5ad3 Mon Sep 17 00:00:00 2001 From: ice_iix Date: Wed, 6 Jan 2021 19:04:39 -0800 Subject: [PATCH 5/5] 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 0a03a2a3..20dd6c20 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 abbe3066..ed4e6906 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";