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

Merge 8e940b7b0c into ecf829c544

This commit is contained in:
iceiix 2023-01-05 13:30:20 +09:00 committed by GitHub
parent ecf829c544 8e940b7b0c
commit 487651df65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
blocks/src/lib.rs
View File

@ -236,8 +236,9 @@ macro_rules! define_blocks {
Block::$name { Block::$name {
$($fname,)? $($fname,)?
} => { } => {
$(return String::from($variant);)? $(return String::from($variant);)*
"normal".to_owned() //"normal".to_owned()
"".to_owned()
} }
)+ )+
} }
@ -6142,7 +6143,7 @@ define_blocks! {
}, },
data Some(facing.horizontal_index()), data Some(facing.horizontal_index()),
offset Some(facing.horizontal_offset()), offset Some(facing.horizontal_offset()),
model { ("minecraft", "silver_glazed_terracotta") }, model { ("minecraft", "light_gray_glazed_terracotta") },
variant format!("facing={}", facing.as_string()), variant format!("facing={}", facing.as_string()),
hardness 1.4, hardness 1.4,
harvest_tools [ Tool::Pickaxe(_), ], harvest_tools [ Tool::Pickaxe(_), ],

2
resources/assets/steven/blockstates/missing_block.json
View File

@ -1,5 +1,5 @@
{ {
"variants": { "variants": {
"normal": { "model": "missing_block" } "": { "model": "missing_block" }
} }
} }

16
src/model/mod.rs
View File

@ -309,15 +309,27 @@ impl Factory {
.read() .read()
.unwrap() .unwrap()
.open(plugin, &format!("models/block/{}.json", model_name)) .open(plugin, &format!("models/block/{}.json", model_name))
{
Some(val) => val,
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, Some(val) => val,
None => { None => {
error!( error!(
"Couldn't find model {}", "Couldn't find model models/block/{}.json or models/{}.json",
format!("models/block/{}.json", model_name) 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));

8
src/resources.rs
View File

@ -26,11 +26,11 @@ use std_or_web::fs;
use crate::types::hash::FNVHash; use crate::types::hash::FNVHash;
use crate::ui; use crate::ui;
const RESOURCES_VERSION: &str = "1.12.2"; const RESOURCES_VERSION: &str = "1.13.2";
const VANILLA_CLIENT_URL: &str = const VANILLA_CLIENT_URL: &str =
"https://launcher.mojang.com/v1/objects/0f275bc1547d01fa5f56ba34bdc87d981ee12daf/client.jar"; "https://launcher.mojang.com/v1/objects/30bfe37a8db404db11c7edf02cb5165817afb4d9/client.jar";
const ASSET_VERSION: &str = "1.12"; const ASSET_VERSION: &str = "1.13.1";
const ASSET_INDEX_URL: &str = "https://launchermeta.mojang.com/mc/assets/1.12/67e29e024e664064c1f04c728604f83c24cbc218/1.12.json"; const ASSET_INDEX_URL: &str = "https://launchermeta.mojang.com/mc/assets/1.13.1/1e710e31f3ce2fe262373b8cf5e054ee5955d904/1.13.1.json";
pub trait Pack: Sync + Send { pub trait Pack: Sync + Send {
fn open(&self, name: &str) -> Option<Box<dyn io::Read>>; fn open(&self, name: &str) -> Option<Box<dyn io::Read>>;