diff --git a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java index c248c0eb..0288c461 100644 --- a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java +++ b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java @@ -53,9 +53,9 @@ public class ItemInsulatedTube extends Item { if (pass == 0) { return 0xffffff; } - return (pass == 1) ? - Material.get(stack.getItemDamage()).getColor() : - Insulate.get(stack.getItemDamage()).getColor(); + return (pass == 1) + ? Material.get(stack.getItemDamage()).getColor() + : Insulate.get(stack.getItemDamage()).getColor(); } @Override diff --git a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java index c1941244..b187134f 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java @@ -135,7 +135,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); if (block.getPrimaryMaterial() != block.getSecondaryMaterial()) { tooltip.add(I18N.localise( - "extratrees.block.tooltip.twoColors", + "extratrees.block.tooltip.twoMaterials", block.getPrimaryMaterial().getName(), block.getSecondaryMaterial().getName() )); diff --git a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java index 8e1fc335..3e30f3a4 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java @@ -1,6 +1,7 @@ package binnie.extratrees.carpentry; import binnie.botany.Botany; +import binnie.core.block.TileEntityMetadata; import binnie.core.util.I18N; import binnie.extratrees.api.IDesign; import cpw.mods.fml.relauncher.Side; @@ -11,6 +12,7 @@ import net.minecraft.block.material.Material; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; +import java.util.List; import java.util.Random; public class BlockStainedDesign extends BlockDesign { @@ -60,4 +62,18 @@ public class BlockStainedDesign extends BlockDesign { public String getBlockName(DesignBlock design) { return I18N.localise("extratrees.block.stainedglass.name", design.getDesign().getName()); } + + @Override + public void addBlockTooltip(ItemStack stack, List tooltip) { + DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); + if (block.getPrimaryMaterial() != block.getSecondaryMaterial()) { + tooltip.add(I18N.localise( + "extratrees.block.tooltip.twoColors", + block.getPrimaryMaterial().getName(), + block.getSecondaryMaterial().getName() + )); + } else { + tooltip.add(block.getPrimaryMaterial().getName()); + } + } } diff --git a/src/main/resources/assets/extratrees/lang/ru_RU.lang b/src/main/resources/assets/extratrees/lang/ru_RU.lang index 16d5985e..42266d53 100644 --- a/src/main/resources/assets/extratrees/lang/ru_RU.lang +++ b/src/main/resources/assets/extratrees/lang/ru_RU.lang @@ -37,7 +37,6 @@ extratrees.machine.tileworker.material=Керамический блок extratrees.machine.worker.error.glueRequired=Требует клей для работы - #ДОСКИ мода EXTRATREES extratrees.block.planks.fir=пихты extratrees.block.planks.cedar=кедра