diff --git a/src/main/java/binnie/botany/ceramic/CeramicColor.java b/src/main/java/binnie/botany/ceramic/CeramicColor.java index db43b212..6403e694 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicColor.java +++ b/src/main/java/binnie/botany/ceramic/CeramicColor.java @@ -39,7 +39,7 @@ public class CeramicColor implements IDesignMaterial { } @Override - public String getName() { + public String getDesignMaterialName() { return this.color.getName(); } diff --git a/src/main/java/binnie/extratrees/api/IDesignMaterial.java b/src/main/java/binnie/extratrees/api/IDesignMaterial.java index b38a5858..9e7abe32 100644 --- a/src/main/java/binnie/extratrees/api/IDesignMaterial.java +++ b/src/main/java/binnie/extratrees/api/IDesignMaterial.java @@ -7,7 +7,7 @@ public interface IDesignMaterial { ItemStack getStack(boolean fireproof); - String getName(); + String getDesignMaterialName(); int getColour(); } diff --git a/src/main/java/binnie/extratrees/block/BlockETDoor.java b/src/main/java/binnie/extratrees/block/BlockETDoor.java index 6e2ef43d..9951c26d 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDoor.java +++ b/src/main/java/binnie/extratrees/block/BlockETDoor.java @@ -231,7 +231,7 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata, ITileEntit public String getDisplayName(ItemStack itemStack) { final int meta = TileEntityMetadata.getItemDamage(itemStack); final String typeName = getDoorType(meta).getName(); - final String woodName = WoodManager.getPlankType(meta & 0xFF).getName(); + final String woodName = WoodManager.getPlankType(meta & 0xFF).getDesignMaterialName(); if (typeName.equals("")) { return Binnie.LANGUAGE.localise(ExtraTrees.instance, "block.door.name", woodName); } diff --git a/src/main/java/binnie/extratrees/block/PlankType.java b/src/main/java/binnie/extratrees/block/PlankType.java index 744f24a0..319b8966 100644 --- a/src/main/java/binnie/extratrees/block/PlankType.java +++ b/src/main/java/binnie/extratrees/block/PlankType.java @@ -132,6 +132,11 @@ public class PlankType { @Override public String getName() { + return "block.planks." + this.toString().toLowerCase(); + } + + @Override + public String getDesignMaterialName() { return ExtraTrees.proxy.localise("block.planks." + this.toString().toLowerCase()); } @@ -197,7 +202,7 @@ public class PlankType { } @Override - public String getName() { + public String getDesignMaterialName() { return ExtraTrees.proxy.localise("block.planks.vanilla." + this.toString().toLowerCase()); } @@ -301,7 +306,7 @@ public class PlankType { } @Override - public String getName() { + public String getDesignMaterialName() { return ExtraTrees.proxy.localise("block.planks.forestry." + this.toString().toLowerCase()); } diff --git a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java index 18b2a3af..af8cfa78 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java @@ -198,8 +198,8 @@ public class BlockMultiFence extends BlockFence implements IBlockMetadata, IStat String woodGrammar = ExtraTrees.proxy.localise("block.multifence" + (twoTypes ? "2" : "") + ".grammar"); woodGrammar = woodGrammar.replaceAll("%PREFIX", fenceType.getPrefix()); - woodGrammar = woodGrammar.replaceAll("%TYPE", typeSecond.getName()); - woodGrammar = woodGrammar.replaceAll("%WOOD", typeFirst.getName()); + woodGrammar = woodGrammar.replaceAll("%TYPE", typeSecond.getDesignMaterialName()); + woodGrammar = woodGrammar.replaceAll("%WOOD", typeFirst.getDesignMaterialName()); return woodGrammar; } diff --git a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java index 406fa051..b46afe14 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java @@ -139,9 +139,9 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); if (block.getPrimaryMaterial() != block.getSecondaryMaterial()) { - tooltip.add(block.getPrimaryMaterial().getName() + " and " + block.getSecondaryMaterial().getName()); + tooltip.add(block.getPrimaryMaterial().getDesignMaterialName() + " and " + block.getSecondaryMaterial().getDesignMaterialName()); } else { - tooltip.add(block.getPrimaryMaterial().getName()); + tooltip.add(block.getPrimaryMaterial().getDesignMaterialName()); } } diff --git a/src/main/java/binnie/extratrees/carpentry/DesignBlock.java b/src/main/java/binnie/extratrees/carpentry/DesignBlock.java index bc305eff..1205a808 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignBlock.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignBlock.java @@ -469,9 +469,9 @@ public class DesignBlock { public String getString() { String type = ""; if (this.getPrimaryMaterial() != this.getSecondaryMaterial()) { - type = this.getPrimaryMaterial().getName() + " and " + this.getSecondaryMaterial().getName(); + type = this.getPrimaryMaterial().getDesignMaterialName() + " and " + this.getSecondaryMaterial().getDesignMaterialName(); } else { - type = this.getPrimaryMaterial().getName(); + type = this.getPrimaryMaterial().getDesignMaterialName(); } return super.toString() + " " + "{" + type + " " + this.getDesign().getName() + " " + (this.panel ? "Panel" : "Tile") + ", Facing:" + this.getFacing() + ", Rotation:" + this.getRotation() + "}"; } diff --git a/src/main/java/binnie/extratrees/carpentry/GlassType.java b/src/main/java/binnie/extratrees/carpentry/GlassType.java index 78e2740b..0ef7ed46 100644 --- a/src/main/java/binnie/extratrees/carpentry/GlassType.java +++ b/src/main/java/binnie/extratrees/carpentry/GlassType.java @@ -71,7 +71,7 @@ public class GlassType implements IDesignMaterial { } @Override - public String getName() { + public String getDesignMaterialName() { return this.name; } diff --git a/src/main/java/binnie/extratrees/core/ModuleCore.java b/src/main/java/binnie/extratrees/core/ModuleCore.java index 9a5232b6..bce43750 100644 --- a/src/main/java/binnie/extratrees/core/ModuleCore.java +++ b/src/main/java/binnie/extratrees/core/ModuleCore.java @@ -83,8 +83,8 @@ public class ModuleCore implements IInitializable { if (wood2 == null) { outputPlanks.println(""); } else { - final String img = "\"""; - outputPlanks.println("" + img + " " + wood2.getName() + ""); + final String img = "\"""; + outputPlanks.println("" + img + " " + wood2.getDesignMaterialName() + ""); } } outputPlanks.println(""); diff --git a/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java b/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java index 511b9343..f293cd71 100644 --- a/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java +++ b/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java @@ -36,7 +36,7 @@ public class ExtraTreesJeiPlugin extends BlankModPlugin { FenceDescription desc = WoodManager.getFenceDescription(itemStack); if (desc != null) { FenceType type = WoodManager.getFenceType(itemStack); - return type + ":" + desc.getPlankType().getName().toLowerCase() + ":" + desc.getSecondaryPlankType().getName().toLowerCase(); + return type + ":" + desc.getPlankType().getDesignMaterialName().toLowerCase() + ":" + desc.getSecondaryPlankType().getDesignMaterialName().toLowerCase(); } return Integer.toString(itemStack.getItemDamage()); });