diff --git a/src/main/java/forestry/arboriculture/items/ItemStairs.java b/src/main/java/forestry/arboriculture/items/ItemStairs.java index 9e1513e77..4a0de393c 100755 --- a/src/main/java/forestry/arboriculture/items/ItemStairs.java +++ b/src/main/java/forestry/arboriculture/items/ItemStairs.java @@ -70,7 +70,6 @@ public class ItemStairs extends ItemForestryBlock { public String getItemStackDisplayName(ItemStack itemstack) { WoodType type = WoodType.getFromCompound(itemstack.getTagCompound()); - - return getWoodNameIS(type) + " " + StringUtil.localize(getUnlocalizedName()); + return StringUtil.localize(getUnlocalizedName() + "." + type.ordinal()); } } diff --git a/src/main/java/forestry/arboriculture/items/ItemWoodBlock.java b/src/main/java/forestry/arboriculture/items/ItemWoodBlock.java index c3fe5f8f0..6d6fa122f 100755 --- a/src/main/java/forestry/arboriculture/items/ItemWoodBlock.java +++ b/src/main/java/forestry/arboriculture/items/ItemWoodBlock.java @@ -37,7 +37,9 @@ public class ItemWoodBlock extends ItemForestryBlock { if (this.getBlock() instanceof IWoodTyped) { IWoodTyped block = (IWoodTyped) getBlock(); - return getWoodNameIS(block.getWoodType(itemstack.getItemDamage())) + " " + StringUtil.localize("tile." + block.getBlockKind()); + int meta = itemstack.getItemDamage(); + WoodType woodType = block.getWoodType(meta); + return StringUtil.localize("tile." + block.getBlockKind() + "." + woodType.ordinal()); } else return StringUtil.localize(getUnlocalizedName(itemstack)); } diff --git a/src/main/resources/assets/forestry/lang/en_US.lang b/src/main/resources/assets/forestry/lang/en_US.lang index b5773b4b6..84cabe1f1 100644 --- a/src/main/resources/assets/forestry/lang/en_US.lang +++ b/src/main/resources/assets/forestry/lang/en_US.lang @@ -748,35 +748,126 @@ fruits.dates=Dates fruits.papaya=Papaya item.grafter=Grafter item.grafterProven=Proven Grafter -tile.log=Wood -tile.planks=Wood Planks -tile.slab=Wood Slab -tile.fences=Fence -tile.for.stairs=Stairs -wood.0=Larch -wood.1=Teak -wood.2=Acacia -wood.3=Lime -wood.4=Chestnut -wood.5=Wenge -wood.6=Baobab -wood.7=Sequoia -wood.8=Kapok -wood.9=Ebony -wood.10=Mahogany -wood.11=Balsa -wood.12=Willow -wood.13=Walnut -wood.14=Greenheart -wood.15=Cherry -wood.16=Mahoe -wood.17=Poplar -wood.18=Palm -wood.19=Papaya -wood.20=Pine -wood.21=Plum -wood.22=Maple -wood.23=Citrus +tile.log.0=Larch Wood +tile.log.1=Teak Wood +tile.log.2=Acacia Wood +tile.log.3=Lime Wood +tile.log.4=Chestnut Wood +tile.log.5=Wenge Wood +tile.log.6=Baobab Wood +tile.log.7=Sequoia Wood +tile.log.8=Kapok Wood +tile.log.9=Ebony Wood +tile.log.10=Mahogany Wood +tile.log.11=Balsa Wood +tile.log.12=Willow Wood +tile.log.13=Walnut Wood +tile.log.14=Greenheart Wood +tile.log.15=Cherry Wood +tile.log.16=Mahoe Wood +tile.log.17=Poplar Wood +tile.log.18=Palm Wood +tile.log.19=Papaya Wood +tile.log.20=Pine Wood +tile.log.21=Plum Wood +tile.log.22=Maple Wood +tile.log.23=Citrus Wood +tile.planks.0=Larch Wood Planks +tile.planks.1=Teak Wood Planks +tile.planks.2=Acacia Wood Planks +tile.planks.3=Lime Wood Planks +tile.planks.4=Chestnut Wood Planks +tile.planks.5=Wenge Wood Planks +tile.planks.6=Baobab Wood Planks +tile.planks.7=Sequoia Wood Planks +tile.planks.8=Kapok Wood Planks +tile.planks.9=Ebony Wood Planks +tile.planks.10=Mahogany Wood Planks +tile.planks.11=Balsa Wood Planks +tile.planks.12=Willow Wood Planks +tile.planks.13=Walnut Wood Planks +tile.planks.14=Greenheart Wood Planks +tile.planks.15=Cherry Wood Planks +tile.planks.16=Mahoe Wood Planks +tile.planks.17=Poplar Wood Planks +tile.planks.18=Palm Wood Planks +tile.planks.19=Papaya Wood Planks +tile.planks.20=Pine Wood Planks +tile.planks.21=Plum Wood Planks +tile.planks.22=Maple Wood Planks +tile.planks.23=Citrus Wood Planks +tile.slab.0=Larch Wood Slab +tile.slab.1=Teak Wood Slab +tile.slab.2=Acacia Wood Slab +tile.slab.3=Lime Wood Slab +tile.slab.4=Chestnut Wood Slab +tile.slab.5=Wenge Wood Slab +tile.slab.6=Baobab Wood Slab +tile.slab.7=Sequoia Wood Slab +tile.slab.8=Kapok Wood Slab +tile.slab.9=Ebony Wood Slab +tile.slab.10=Mahogany Wood Slab +tile.slab.11=Balsa Wood Slab +tile.slab.12=Willow Wood Slab +tile.slab.13=Walnut Wood Slab +tile.slab.14=Greenheart Wood Slab +tile.slab.15=Cherry Wood Slab +tile.slab.16=Mahoe Wood Slab +tile.slab.17=Poplar Wood Slab +tile.slab.18=Palm Wood Slab +tile.slab.19=Papaya Wood Slab +tile.slab.20=Pine Wood Slab +tile.slab.21=Plum Wood Slab +tile.slab.22=Maple Wood Slab +tile.slab.23=Citrus Wood Slab +tile.fences.0=Larch Fence +tile.fences.1=Teak Fence +tile.fences.2=Acacia Fence +tile.fences.3=Lime Fence +tile.fences.4=Chestnut Fence +tile.fences.5=Wenge Fence +tile.fences.6=Baobab Fence +tile.fences.7=Sequoia Fence +tile.fences.8=Kapok Fence +tile.fences.9=Ebony Fence +tile.fences.10=Mahogany Fence +tile.fences.11=Balsa Fence +tile.fences.12=Willow Fence +tile.fences.13=Walnut Fence +tile.fences.14=Greenheart Fence +tile.fences.15=Cherry Fence +tile.fences.16=Mahoe Fence +tile.fences.17=Poplar Fence +tile.fences.18=Palm Fence +tile.fences.19=Papaya Fence +tile.fences.20=Pine Fence +tile.fences.21=Plum Fence +tile.fences.22=Maple Fence +tile.fences.23=Citrus Fence +tile.for.stairs.0=Larch Stairs +tile.for.stairs.1=Teak Stairs +tile.for.stairs.2=Acacia Stairs +tile.for.stairs.3=Lime Stairs +tile.for.stairs.4=Chestnut Stairs +tile.for.stairs.5=Wenge Stairs +tile.for.stairs.6=Baobab Stairs +tile.for.stairs.7=Sequoia Stairs +tile.for.stairs.8=Kapok Stairs +tile.for.stairs.9=Ebony Stairs +tile.for.stairs.10=Mahogany Stairs +tile.for.stairs.11=Balsa Stairs +tile.for.stairs.12=Willow Stairs +tile.for.stairs.13=Walnut Stairs +tile.for.stairs.14=Greenheart Stairs +tile.for.stairs.15=Cherry Stairs +tile.for.stairs.16=Mahoe Stairs +tile.for.stairs.17=Poplar Stairs +tile.for.stairs.18=Palm Stairs +tile.for.stairs.19=Papaya Stairs +tile.for.stairs.20=Pine Stairs +tile.for.stairs.21=Plum Stairs +tile.for.stairs.22=Maple Stairs +tile.for.stairs.23=Citrus Stairs tile.for.arboriculture.0=Arborist's Chest ####################