From e9ad1bda8e56f71a9c30643cf729e7b60ebf86d2 Mon Sep 17 00:00:00 2001 From: kordum Date: Wed, 12 Jul 2017 12:30:19 +0300 Subject: [PATCH] Fix #197 Fix wrong name for flowers --- src/main/java/binnie/botany/flower/BlockFlower.java | 11 +++++++++++ src/main/resources/assets/botany/lang/en_US.lang | 1 + src/main/resources/assets/botany/lang/ru_RU.lang | 1 + 3 files changed, 13 insertions(+) diff --git a/src/main/java/binnie/botany/flower/BlockFlower.java b/src/main/java/binnie/botany/flower/BlockFlower.java index 381a2400..e2e49017 100644 --- a/src/main/java/binnie/botany/flower/BlockFlower.java +++ b/src/main/java/binnie/botany/flower/BlockFlower.java @@ -39,6 +39,11 @@ public class BlockFlower extends BlockContainer { setStepSound(Block.soundTypeGrass); } + @Override + public String getUnlocalizedName() { + return "botany.flower"; + } + @Override public int getRenderType() { return RendererBotany.renderID; @@ -218,4 +223,10 @@ public class BlockFlower extends BlockContainer { } return hasBeenBroken; } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int meta, int side) { + return Blocks.yellow_flower.getIcon(0, 0); + } } diff --git a/src/main/resources/assets/botany/lang/en_US.lang b/src/main/resources/assets/botany/lang/en_US.lang index 0a0cf6e9..7d899a1a 100644 --- a/src/main/resources/assets/botany/lang/en_US.lang +++ b/src/main/resources/assets/botany/lang/en_US.lang @@ -182,6 +182,7 @@ item.trowelIron.name=Iron Trowel item.trowelGold.name=Gold Trowel item.trowelDiamond.name=Diamond Trowel +botany.flower.name=Flower botany.flower.dandelion=Dandelion botany.flower.poppy=Poppy botany.flower.orchid=Orchid diff --git a/src/main/resources/assets/botany/lang/ru_RU.lang b/src/main/resources/assets/botany/lang/ru_RU.lang index 0ce054c5..572e0e35 100644 --- a/src/main/resources/assets/botany/lang/ru_RU.lang +++ b/src/main/resources/assets/botany/lang/ru_RU.lang @@ -182,6 +182,7 @@ item.trowelIron.name=Железный совок item.trowelGold.name=Золотой совок item.trowelDiamond.name=Алмазный совок +botany.flower.name=Цветок botany.flower.dandelion=Одуванчик botany.flower.poppy=Мак botany.flower.orchid=Орхидея