Added wood

assets/common/material_stats_manifest.ron

@@ -1,15 +1,6 @@
 // Keep in mind that material stats are multiplied by the form stats, not added (e.g. equip_time_secs is most sensitive to this)
 ({
-    "common.items.mineral.ingot.bloodsteel": (
-        equip_time_secs: 1.0,
-        power: 1.75,
-        effect_power: 1.0,
-        speed: 1.0,
-        crit_chance: 1.0,
-        range: 1.0,
-        energy_efficiency: 1.0,
-        buff_strength: 1.0,
-    ),
+    // Metals
     "common.items.mineral.ingot.bronze": (
         equip_time_secs: 1.0,
         power: 0.75,
@@ -20,26 +11,6 @@
         energy_efficiency: 1.0,
         buff_strength: 1.0,
     ),
-    "common.items.mineral.ingot.cobalt": (
-        equip_time_secs: 1.0,
-        power: 1.5,
-        effect_power: 1.0,
-        speed: 1.0,
-        crit_chance: 1.0,
-        range: 1.0,
-        energy_efficiency: 1.0,
-        buff_strength: 1.0,
-    ),
-    "common.items.mineral.ingot.copper": (
-        equip_time_secs: 1.0,
-        power: 0.5,
-        effect_power: 1.0,
-        speed: 1.0,
-        crit_chance: 1.0,
-        range: 1.0,
-        energy_efficiency: 1.0,
-        buff_strength: 1.0,
-    ),
     "common.items.mineral.ingot.iron": (
         equip_time_secs: 1.0,
         power: 1.0,
@@ -60,9 +31,90 @@
         energy_efficiency: 1.0,
         buff_strength: 1.0,
     ),
-    "common.items.mineral.ingot.tin": (
+    "common.items.mineral.ingot.cobalt": (
         equip_time_secs: 1.0,
-        power: 0.5,
+        power: 1.5,
+        effect_power: 1.0,
+        speed: 1.0,
+        crit_chance: 1.0,
+        range: 1.0,
+        energy_efficiency: 1.0,
+        buff_strength: 1.0,
+    ),
+    "common.items.mineral.ingot.bloodsteel": (
+        equip_time_secs: 1.0,
+        power: 1.75,
+        effect_power: 1.0,
+        speed: 1.0,
+        crit_chance: 1.0,
+        range: 1.0,
+        energy_efficiency: 1.0,
+        buff_strength: 1.0,
+    ),
+    "common.items.mineral.ingot.orichalcum": (
+        equip_time_secs: 1.0,
+        power: 2.0,
+        effect_power: 1.0,
+        speed: 1.0,
+        crit_chance: 1.0,
+        range: 1.0,
+        energy_efficiency: 1.0,
+        buff_strength: 1.0,
+    ),
+    // Woods
+    "common.items.log.wood": (
+        equip_time_secs: 1.0,
+        power: 0.75,
+        effect_power: 1.0,
+        speed: 1.0,
+        crit_chance: 1.0,
+        range: 1.0,
+        energy_efficiency: 1.0,
+        buff_strength: 1.0,
+    ),
+    "common.items.log.bamboo": (
+        equip_time_secs: 1.0,
+        power: 1.0,
+        effect_power: 1.0,
+        speed: 1.0,
+        crit_chance: 1.0,
+        range: 1.0,
+        energy_efficiency: 1.0,
+        buff_strength: 1.0,
+    ),
+    "common.items.log.hardwood": (
+        equip_time_secs: 1.0,
+        power: 1.25,
+        effect_power: 1.0,
+        speed: 1.0,
+        crit_chance: 1.0,
+        range: 1.0,
+        energy_efficiency: 1.0,
+        buff_strength: 1.0,
+    ),
+    "common.items.log.ironwood": (
+        equip_time_secs: 1.0,
+        power: 1.5,
+        effect_power: 1.0,
+        speed: 1.0,
+        crit_chance: 1.0,
+        range: 1.0,
+        energy_efficiency: 1.0,
+        buff_strength: 1.0,
+    ),
+    "common.items.log.frostwood": (
+        equip_time_secs: 1.0,
+        power: 1.75,
+        effect_power: 1.0,
+        speed: 1.0,
+        crit_chance: 1.0,
+        range: 1.0,
+        energy_efficiency: 1.0,
+        buff_strength: 1.0,
+    ),
+    "common.items.log.eldwood": (
+        equip_time_secs: 1.0,
+        power: 2.0,
         effect_power: 1.0,
         speed: 1.0,
         crit_chance: 1.0,

assets/voxygen/item_image_manifest.ron

@@ -2909,6 +2909,30 @@
         "voxel.sprite.crafting_ing.animal_misc.phoenix_feather",
         (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.2,
     ),
+    Ingredient("Bamboo"): VoxTrans(
+        "voxel.sprite.wood.item.bamboo",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
+    Ingredient("EldwoodLogs"): VoxTrans(
+        "voxel.sprite.wood.item.eldwood",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
+    Ingredient("FrostwoodLogs"): VoxTrans(
+        "voxel.sprite.wood.item.frostwood",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
+    Ingredient("HardwoodLogs"): VoxTrans(
+        "voxel.sprite.wood.item.hardwood",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
+    Ingredient("IronwoodLogs"): VoxTrans(
+        "voxel.sprite.wood.item.ironwood",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
+    Ingredient("WoodLogs"): VoxTrans(
+        "voxel.sprite.wood.item.wood",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
     // Gliders
     Glider("Starter"): VoxTrans(
         "voxel.glider.starter",

assets/voxygen/voxel/sprite_manifest.ron

@@ -3884,4 +3884,65 @@ EnsnaringWeb: Some((
     ],
     wind_sway: 0.0,
 )),
+// WOOOOOOD
+Wood: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.wood.log.wood",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+    ],
+    wind_sway: 0.0,
+)),
+Bamboo: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.wood.log.bamboo",
+            offset: (-6.5, -6.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+    ],
+    wind_sway: 0.0,
+)),
+Hardwood: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.wood.log.hardwood",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+    ],
+    wind_sway: 0.0,
+)),
+Ironwood: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.wood.log.ironwood",
+            offset: (-6.5, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+    ],
+    wind_sway: 0.0,
+)),
+Frostwood: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.wood.log.frostwood",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+    ],
+    wind_sway: 0.0,
+)),
+Eldwood: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.wood.log.eldwood",
+            offset: (-4.5, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+    ],
+    wind_sway: 0.0,
+)),
 )

common/src/terrain/sprite.rs

@@ -209,6 +209,12 @@ make_case_elim!(
         Hearth = 0xB6,
         ForgeTools = 0xB7,
         CliffDecorBlock = 0xB8,
+        Wood = 0xB9,
+        Bamboo = 0xBA,
+        Hardwood = 0xBB,
+        Ironwood = 0xBC,
+        Frostwood = 0xBD,
+        Eldwood = 0xBE,
     }
 );
 
@@ -318,6 +324,12 @@ impl SpriteKind {
             SpriteKind::Hearth => 2.3,
             SpriteKind::ForgeTools => 2.8,
             SpriteKind::CliffDecorBlock => 1.0,
+            SpriteKind::Wood
+            | SpriteKind::Hardwood
+            | SpriteKind::Ironwood
+            | SpriteKind::Frostwood
+            | SpriteKind::Eldwood => 7.0 / 11.0,
+            SpriteKind::Bamboo => 9.0 / 11.0,
             _ => return None,
         })
     }

voxygen/src/hud/crafting.rs

@@ -28,7 +28,7 @@ use conrod_core::{
     widget_ids, Color, Colorable, Labelable, Positionable, Sizeable, Widget, WidgetCommon,
 };
 use i18n::Localization;
-use std::{borrow::Cow, sync::Arc};
+use std::sync::Arc;
 
 use strum::{EnumIter, IntoEnumIterator};
 
@@ -467,7 +467,7 @@ impl<'a> Widget for Crafting<'a> {
                 },
                 SearchFilter::Input => recipe.inputs().any(|(input, _, _)| {
                     let input_name = match input {
-                        RecipeInput::Item(def) => Cow::Borrowed(&def.name()),
+                        RecipeInput::Item(def) => def.name(),
                         RecipeInput::Tag(tag) => tag.name(),
                         RecipeInput::TagSameItem(tag, _) => tag.name(),
                     }