Fix wrong wood design block localization

This commit is contained in:
kordum committed 2017-07-06 14:29:37 +03:00
1 parent 2aa0b9bb8c
commit 6f1d00e4f5
4 files changed
+20 -5

No files matched your search

@@ -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
@@ -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()
));
@@ -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());
}
}
}