Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

style

Browse Source
This commit is contained in:
juliancoffee 2021-06-26 22:05:01 +03:00
parent 12b5d655cf
commit 681fd37429
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/recipe.rs
View File

@ -113,7 +113,6 @@ impl assets::Compound for RecipeBook {
cache: &assets::AssetCache<S>,
specifier: &str,
) -> Result<Self, assets::Error> {
#[inline]
fn load_item_def(spec: &(String, u32)) -> Result<(Arc<ItemDef>, u32), assets::Error> {
let def = Arc::<ItemDef>::load_cloned(&spec.0)?;

4
voxygen/src/hud/crafting.rs
View File

@ -185,7 +185,6 @@ impl CraftingTab {
fn satisfies(self, recipe: &Recipe) -> bool {
let (item, _count) = &recipe.output;
let recycling = recipe.is_recycling;
match self {
CraftingTab::All => true,
CraftingTab::Food => item.tags().contains(&ItemTag::Food),
@ -199,7 +198,8 @@ impl CraftingTab {
(item.tags().contains(&ItemTag::MetalIngot)
|| item.tags().contains(&ItemTag::Textile)
|| item.tags().contains(&ItemTag::Leather)
|| item.tags().contains(&ItemTag::BaseMaterial)) && !recycling
|| item.tags().contains(&ItemTag::BaseMaterial))
&& !recipe.is_recycling
},
CraftingTab::Bag => item.tags().contains(&ItemTag::Bag),
CraftingTab::Tool => item.tags().contains(&ItemTag::CraftingTool),