diff --git a/src/main/java/binnie/Binnie.java b/src/main/java/binnie/Binnie.java index 53808fd1..3ca04aa4 100644 --- a/src/main/java/binnie/Binnie.java +++ b/src/main/java/binnie/Binnie.java @@ -14,7 +14,7 @@ import java.util.List; public final class Binnie { public static List Managers = new ArrayList<>(); - public static ManagerLanguage Language = new ManagerLanguage(); + public static ManagerLanguage I18N = new ManagerLanguage(); public static ManagerGenetics Genetics = new ManagerGenetics(); public static ManagerConfig Configuration = new ManagerConfig(); public static ManagerLiquid Liquid = new ManagerLiquid(); diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramic.java b/src/main/java/binnie/botany/ceramic/BlockCeramic.java index 542c4bf4..6a4b1834 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramic.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramic.java @@ -1,5 +1,6 @@ package binnie.botany.ceramic; +import binnie.Binnie; import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.botany.genetics.EnumFlowerColor; @@ -16,6 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; @@ -74,13 +76,13 @@ public class BlockCeramic extends Block implements IBlockMetadata { @Override public String getBlockName(ItemStack itemStack) { - int meta = TileEntityMetadata.getItemDamage(itemStack); - return EnumFlowerColor.get(meta).getName() + " Ceramic Block"; + return Binnie.I18N.localise(Botany.instance, "ceramicBlock"); } @Override - public void getBlockTooltip(ItemStack itemStack, List tooltip) { - // ignored + public void addBlockTooltip(ItemStack stack, List tooltip) { + int meta = TileEntityMetadata.getItemDamage(stack); + tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(meta).getName()); } @Override @@ -89,7 +91,7 @@ public class BlockCeramic extends Block implements IBlockMetadata { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubBlocks(Item item, CreativeTabs tabs, List itemList) { for (EnumFlowerColor c : EnumFlowerColor.values()) { itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal())); } @@ -127,14 +129,13 @@ public class BlockCeramic extends Block implements IBlockMetadata { } @Override - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - super.breakBlock(par1World, par2, par3, par4, par5, par6); - par1World.removeTileEntity(par2, par3, par4); + public void breakBlock(World world, int x, int y, int z, Block block, int side) { + super.breakBlock(world, x, y, z, block, side); + world.removeTileEntity(x, y, z); } - // TODO remove deprecated @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) { return BlockMetadata.getPickBlock(world, x, y, z); } diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java b/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java index d188699d..2ac7dc11 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java @@ -1,15 +1,12 @@ package binnie.botany.ceramic; +import binnie.Binnie; import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.botany.genetics.EnumFlowerColor; import binnie.botany.items.BotanyItems; import binnie.core.BinnieCore; -import binnie.core.block.BlockMetadata; -import binnie.core.block.IBlockMetadata; -import binnie.core.block.IMultipassBlock; -import binnie.core.block.MultipassBlockRenderer; -import binnie.core.block.TileEntityMetadata; +import binnie.core.block.*; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; @@ -20,6 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; @@ -86,8 +84,9 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa } @Override - public void getBlockTooltip(ItemStack itemStack, List tooltip) { - // ignored + public void addBlockTooltip(ItemStack itemStack, List tooltip) { + int meta = TileEntityMetadata.getItemDamage(itemStack); + getType(meta).addTooltip(tooltip); } @Override @@ -96,7 +95,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubBlocks(Item item, CreativeTabs tab, List itemList) { for (EnumFlowerColor c : EnumFlowerColor.values()) { BlockType type = new BlockType(c, c, TileType.Tile); itemList.add(TileEntityMetadata.getItemStack(this, type.ordinal())); @@ -145,7 +144,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa if (tile != null) { return getRenderColor(tile.getTileMetadata()); } - return 16777215; + return 0xffffff; } @Override @@ -188,16 +187,16 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa } public enum TileType { - Tile("tile", "Ceramic Tile"), - Brick("brick", "Ceramic Bricks"), - StripeBrick("brickstripe", "Striped Ceramic Bricks"), - LargeBrick("bricklarge", "Large Ceramic Bricks"), - Split("split", "Split Ceramic Tile"), - Chequered("cheque", "Chequered Ceramic Tile"), - Mixed("mixed", "Mixed Ceramic Tile"), - VerticalBrick("verticalbrick", "Vertical Ceramic Bricks"), - VerticalStripeBrick("verticalbrickstripe", "Vertical Striped Ceramic Bricks"), - VerticalLargeBrick("verticalbricklarge", "Large Vertical Ceramic Bricks"); + Tile("tile", "ceramicTile"), + Brick("brick", "ceramicBricks"), + StripeBrick("brickstripe", "strippedCeramicBricks"), + LargeBrick("bricklarge", "largeCeramicBricks"), + Split("split", "splitCeramicTile"), + Chequered("cheque", "chequeredCeramicTile"), + Mixed("mixed", "mixedCeramicTile"), + VerticalBrick("verticalbrick", "verticalCeramicBricks"), + VerticalStripeBrick("verticalbrickstripe", "verticalStripedCeramicBricks"), + VerticalLargeBrick("verticalbricklarge", "largeVerticalCeramicBricks"); protected String id; protected String name; @@ -419,8 +418,8 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa private ItemStack getBrickRecipe(List stacks) { if (stacks.size() == 1) { - ItemStack stack5 = stacks.get(0); - BlockType type = new BlockType(stack5); + ItemStack stack = stacks.get(0); + BlockType type = new BlockType(stack); if (type.type == TileType.VerticalBrick) { type.type = this; return type.getStack(1); @@ -439,18 +438,18 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa int[] colors = {-1, -1}; for (int index2 = 0; index2 < stacks.size(); ++index2) { - ItemStack stack4 = stacks.get(index2); - if (stack4.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) { + ItemStack stack = stacks.get(index2); + if (stack.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) { return null; } - BlockType type4 = new BlockType(stack4); - if (type4.type != TileType.LargeBrick) { + BlockType type = new BlockType(stack); + if (type.type != TileType.LargeBrick) { return null; } - int color5 = type4.color1.ordinal(); - int color6 = type4.color2.ordinal(); + int color5 = type.color1.ordinal(); + int color6 = type.color2.ordinal(); int alt2 = (index2 != 0 && index2 != 3) ? 1 : 0; if (this == TileType.StripeBrick) { alt2 = 0; @@ -528,11 +527,15 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa } public String getName() { + return Binnie.I18N.localise(Botany.instance, type.name); + } + + public void addTooltip(List tooltip) { String name = color1.getName(); if (type.canDouble() && color2 != color1) { - name = name + " & " + color2.getName(); + name = Binnie.I18N.localise(Botany.instance, "colour.double", name, color2.getName()); } - return name + " " + type.name; + tooltip.add(EnumChatFormatting.GRAY + name); } public int ordinal() { diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramicPatterned.java b/src/main/java/binnie/botany/ceramic/BlockCeramicPatterned.java index 2b036711..3b33951f 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramicPatterned.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramicPatterned.java @@ -1,13 +1,19 @@ package binnie.botany.ceramic; +import binnie.Binnie; +import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.botany.genetics.EnumFlowerColor; +import binnie.core.block.TileEntityMetadata; import binnie.extratrees.api.IDesign; import binnie.extratrees.carpentry.BlockDesign; import binnie.extratrees.carpentry.DesignBlock; import binnie.extratrees.carpentry.ModuleCarpentry; import net.minecraft.block.material.Material; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + +import java.util.List; public class BlockCeramicPatterned extends BlockDesign { public BlockCeramicPatterned() { @@ -25,6 +31,13 @@ public class BlockCeramicPatterned extends BlockDesign { @Override public String getBlockName(DesignBlock design) { - return design.getDesign().getName() + " Ceramic Block"; + return Binnie.I18N.localise(Botany.instance, "ceramicBlock"); + } + + @Override + public void addBlockTooltip(ItemStack stack, List tooltip) { + super.addBlockTooltip(stack, tooltip); + DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); + tooltip.add(EnumChatFormatting.GRAY + block.getDesign().getName()); } } diff --git a/src/main/java/binnie/botany/ceramic/BlockStained.java b/src/main/java/binnie/botany/ceramic/BlockStained.java index 87bd7c4d..4dd042ff 100644 --- a/src/main/java/binnie/botany/ceramic/BlockStained.java +++ b/src/main/java/binnie/botany/ceramic/BlockStained.java @@ -1,5 +1,6 @@ package binnie.botany.ceramic; +import binnie.Binnie; import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.botany.genetics.EnumFlowerColor; @@ -17,6 +18,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; @@ -59,9 +61,9 @@ public class BlockStained extends Block implements IBlockMetadata { @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { // Block block2 = world.getBlock(x - Facing.offsetsXForSide[side], y - Facing.offsetsYForSide[side], z - Facing.offsetsZForSide[side]); - Block block3 = world.getBlock(x, y, z); - return block3 != this - && block3 != ExtraTrees.blockStained + Block block = world.getBlock(x, y, z); + return block != this + && block != ExtraTrees.blockStained && super.shouldSideBeRendered(world, x, y, z, side); } @@ -70,9 +72,8 @@ public class BlockStained extends Block implements IBlockMetadata { return BlockMetadata.getBlockDropped(this, world, x, y, z, blockMeta); } - // TODO remove deprecated @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { return BlockMetadata.breakBlock(this, player, world, x, y, z); } @@ -105,13 +106,13 @@ public class BlockStained extends Block implements IBlockMetadata { @Override public String getBlockName(ItemStack itemStack) { - int meta = TileEntityMetadata.getItemDamage(itemStack); - return EnumFlowerColor.get(meta).getName() + " Pigmented Glass"; + return Binnie.I18N.localise(Botany.instance, "pigmentedGlass"); } @Override - public void getBlockTooltip(ItemStack itemStack, List tooltip) { - // ignored + public void addBlockTooltip(ItemStack itemStack, List tooltip) { + int meta = TileEntityMetadata.getItemDamage(itemStack); + tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(meta).getName()); } @Override @@ -154,7 +155,7 @@ public class BlockStained extends Block implements IBlockMetadata { if (tile != null) { return getRenderColor(tile.getTileMetadata()); } - return 16777215; + return 0xffffff; } @Override @@ -184,7 +185,7 @@ public class BlockStained extends Block implements IBlockMetadata { } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) { return BlockMetadata.getPickBlock(world, x, y, z); } diff --git a/src/main/java/binnie/botany/ceramic/ItemCeramic.java b/src/main/java/binnie/botany/ceramic/ItemCeramic.java deleted file mode 100644 index 86007faf..00000000 --- a/src/main/java/binnie/botany/ceramic/ItemCeramic.java +++ /dev/null @@ -1,20 +0,0 @@ -package binnie.botany.ceramic; - -import binnie.core.block.ItemMetadata; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - -// TODO unused class? -public class ItemCeramic extends ItemMetadata { - public ItemCeramic(Block block) { - super(block); - } - - @Override - @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack stack, int renderPass) { - return 0xff00ff; - } -} diff --git a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java index 0b936172..5161cf7a 100644 --- a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java +++ b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java @@ -9,8 +9,9 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; public class PigmentRecipe implements IRecipe { + protected ItemStack cached; + private ItemStack unknown; - ItemStack cached; public PigmentRecipe() { unknown = null; diff --git a/src/main/java/binnie/botany/core/ModuleCore.java b/src/main/java/binnie/botany/core/ModuleCore.java index c08ac83a..cd471ed3 100644 --- a/src/main/java/binnie/botany/core/ModuleCore.java +++ b/src/main/java/binnie/botany/core/ModuleCore.java @@ -11,13 +11,13 @@ public class ModuleCore implements IInitializable { @Override public void preInit() { for (EnumAcidity pH : EnumAcidity.values()) { - Binnie.Language.addObjectName(pH, Binnie.Language.unlocalised(Botany.instance, "ph." + pH.getID())); + Binnie.I18N.addObjectName(pH, Binnie.I18N.unlocalised(Botany.instance, "ph." + pH.getID())); } for (EnumMoisture pH2 : EnumMoisture.values()) { - Binnie.Language.addObjectName(pH2, Binnie.Language.unlocalised(Botany.instance, "moisture." + pH2.getID())); + Binnie.I18N.addObjectName(pH2, Binnie.I18N.unlocalised(Botany.instance, "moisture." + pH2.getID())); } for (EnumSoilType pH3 : EnumSoilType.values()) { - Binnie.Language.addObjectName(pH3, Binnie.Language.unlocalised(Botany.instance, "soil." + pH3.getID())); + Binnie.I18N.addObjectName(pH3, Binnie.I18N.unlocalised(Botany.instance, "soil." + pH3.getID())); } } diff --git a/src/main/java/binnie/botany/craftgui/ControlColorMixBox.java b/src/main/java/binnie/botany/craftgui/ControlColorMixBox.java index 2b964d9a..b70a1c49 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColorMixBox.java +++ b/src/main/java/binnie/botany/craftgui/ControlColorMixBox.java @@ -5,7 +5,6 @@ import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.listbox.ControlListBox; public class ControlColorMixBox extends ControlListBox { - private int index; private Type type; public ControlColorMixBox(IWidget parent, int x, int y, int width, int height, Type type) { diff --git a/src/main/java/binnie/botany/craftgui/ControlColorMixItem.java b/src/main/java/binnie/botany/craftgui/ControlColorMixItem.java index 67e49549..e46f0690 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColorMixItem.java +++ b/src/main/java/binnie/botany/craftgui/ControlColorMixItem.java @@ -7,11 +7,11 @@ import binnie.core.craftgui.database.WindowAbstractDatabase; import binnie.core.genetics.BreedingSystem; public class ControlColorMixItem extends ControlOption { - ControlColorDisplay itemWidget1; - ControlColorDisplay itemWidget2; - ControlColorDisplay itemWidget3; - ControlColourMixSymbol addSymbol; - ControlColourMixSymbol arrowSymbol; + protected ControlColorDisplay itemWidget1; + protected ControlColorDisplay itemWidget2; + protected ControlColorDisplay itemWidget3; + protected ControlColourMixSymbol addSymbol; + protected ControlColourMixSymbol arrowSymbol; public ControlColorMixItem(ControlList controlList, IColourMix option, int y) { super(controlList, option, y); diff --git a/src/main/java/binnie/botany/craftgui/ControlColorOption.java b/src/main/java/binnie/botany/craftgui/ControlColorOption.java index 843285ee..f3627f19 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColorOption.java +++ b/src/main/java/binnie/botany/craftgui/ControlColorOption.java @@ -9,8 +9,8 @@ import binnie.core.craftgui.geometry.CraftGUIUtil; import binnie.core.craftgui.geometry.IPoint; public class ControlColorOption extends ControlTextOption { - ControlColorDisplay controlBee; - IPoint boxPosition; + protected ControlColorDisplay controlBee; + protected IPoint boxPosition; public ControlColorOption(ControlList controlList, IFlowerColor option, int y) { super(controlList, option, option.getName(), y); diff --git a/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java b/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java index d366ab1a..7985668b 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java @@ -1,5 +1,7 @@ package binnie.botany.craftgui; +import binnie.Binnie; +import binnie.botany.Botany; import binnie.botany.api.IColourMix; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; @@ -13,16 +15,11 @@ import binnie.core.craftgui.resource.minecraft.CraftGUITextureSheet; import binnie.core.craftgui.resource.minecraft.StandardTexture; public class ControlColourMixSymbol extends Control implements ITooltip { - static Texture MutationPlus; - static Texture MutationArrow; + protected static Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2); + protected static Texture MutationArrow = new StandardTexture(20, 94, 32, 16, CraftGUITextureSheet.Controls2); - static { - ControlColourMixSymbol.MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2); - ControlColourMixSymbol.MutationArrow = new StandardTexture(20, 94, 32, 16, CraftGUITextureSheet.Controls2); - } - - IColourMix value; - int type; + protected IColourMix value; + protected int type; protected ControlColourMixSymbol(IWidget parent, int x, int y, int type) { super(parent, x, y, 16 + type * 16, 16.0f); @@ -43,14 +40,14 @@ public class ControlColourMixSymbol extends Control implements ITooltip { public void setValue(IColourMix value) { this.value = value; - setColor(16777215); + setColor(0xffffff); } @Override public void getTooltip(Tooltip tooltip) { if (type == 1) { float chance = value.getChance(); - tooltip.add("Current Chance - " + chance + "%"); + tooltip.add(Binnie.I18N.localise(Botany.instance, "gui.controls.colorMixSymbol.chance", chance)); } } } diff --git a/src/main/java/binnie/botany/craftgui/PageColorMixResultant.java b/src/main/java/binnie/botany/craftgui/PageColorMixResultant.java index 875f4066..9f71d136 100644 --- a/src/main/java/binnie/botany/craftgui/PageColorMixResultant.java +++ b/src/main/java/binnie/botany/craftgui/PageColorMixResultant.java @@ -1,5 +1,7 @@ package binnie.botany.craftgui; +import binnie.Binnie; +import binnie.botany.Botany; import binnie.botany.api.IColourMix; import binnie.botany.api.IFlowerColor; import binnie.botany.core.BotanyCore; @@ -18,7 +20,7 @@ public class PageColorMixResultant extends PageAbstract { public PageColorMixResultant(IWidget parent, DatabaseTab tab) { super(parent, tab); - pageSpeciesFurtherTitle = new ControlTextCentered(this, 8.0f, "Resultant Mixes"); + pageSpeciesFurtherTitle = new ControlTextCentered(this, 8.0f, Binnie.I18N.localise(Botany.instance, "gui.controls.pageSpeciesFurtherTitle")); pageSpeciesFurtherList = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.Resultant); } diff --git a/src/main/java/binnie/botany/craftgui/PageColourMix.java b/src/main/java/binnie/botany/craftgui/PageColourMix.java index 65ebb852..b7dfed40 100644 --- a/src/main/java/binnie/botany/craftgui/PageColourMix.java +++ b/src/main/java/binnie/botany/craftgui/PageColourMix.java @@ -1,5 +1,7 @@ package binnie.botany.craftgui; +import binnie.Binnie; +import binnie.botany.Botany; import binnie.botany.api.IColourMix; import binnie.botany.api.IFlowerColor; import binnie.botany.core.BotanyCore; @@ -13,13 +15,13 @@ import java.util.ArrayList; import java.util.List; public class PageColourMix extends PageAbstract { - ControlText pageSpeciesFurther_Title; - ControlColorMixBox pageSpeciesFurther_List; + ControlText pageSpeciesFurtherTitle; + ControlColorMixBox pageSpeciesFurtherList; public PageColourMix(IWidget parent, DatabaseTab tab) { super(parent, tab); - pageSpeciesFurther_Title = new ControlTextCentered(this, 8.0f, "Further Mixes"); - pageSpeciesFurther_List = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.Further); + pageSpeciesFurtherTitle = new ControlTextCentered(this, 8.0f, Binnie.I18N.localise(Botany.instance, "gui.controls.pageColorFurtherTitle")); + pageSpeciesFurtherList = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.Further); } @Override @@ -30,6 +32,6 @@ public class PageColourMix extends PageAbstract { mixes.add(mix); } } - pageSpeciesFurther_List.setOptions(mixes); + pageSpeciesFurtherList.setOptions(mixes); } } diff --git a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java index 09648ecb..d14720f0 100644 --- a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java +++ b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java @@ -27,13 +27,6 @@ public class PageSpeciesFlowerGenome extends PageSpecies { super(parent, tab); } - public static String tolerated(boolean t) { - if (t) { - return "Tolerated"; - } - return "Not Tolerated"; - } - @Override public void onValueChanged(IAlleleSpecies species) { deleteAllChildren(); @@ -41,42 +34,51 @@ public class PageSpeciesFlowerGenome extends PageSpecies { if (template == null) { return; } + IFlower tree = Binnie.Genetics.getFlowerRoot().templateAsIndividual(template); if (tree == null) { return; } + IFlowerGenome genome = tree.getGenome(); IAlleleFlowerSpecies treeSpecies = genome.getPrimary(); int w = 144; int h = 176; + // TODO localise new ControlText(this, new IArea(0.0f, 4.0f, w, 16.0f), "Genome", TextJustification.MiddleCenter); ControlScrollableContent scrollable = new ControlScrollableContent(this, 4.0f, 20.0f, w - 8, h - 8 - 16, 12.0f); Control contents = new Control(scrollable, 0.0f, 0.0f, w - 8 - 12, h - 8 - 16); + int tw = w - 8 - 12; int w2 = 55; int w3 = tw - 50; int y = 0; int th = 14; - int th2 = 18; new ControlText(contents, new IArea(0.0f, y, w2, th), "Temp. : ", TextJustification.MiddleRight); new ControlText(contents, new IArea(w2, y, w3, th), treeSpecies.getTemperature().getName(), TextJustification.MiddleLeft); y += th; + new ControlText(contents, new IArea(0.0f, y, w2, th), "Moist. : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), Binnie.Language.localise(treeSpecies.getMoisture()), TextJustification.MiddleLeft); + new ControlText(contents, new IArea(w2, y, w3, th), Binnie.I18N.localise(treeSpecies.getMoisture()), TextJustification.MiddleLeft); y += th; + new ControlText(contents, new IArea(0.0f, y, w2, th), "pH. : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), Binnie.Language.localise(treeSpecies.getPH()), TextJustification.MiddleLeft); + new ControlText(contents, new IArea(w2, y, w3, th), Binnie.I18N.localise(treeSpecies.getPH()), TextJustification.MiddleLeft); y += th; + new ControlText(contents, new IArea(0.0f, y, w2, th), "Fertility : ", TextJustification.MiddleRight); new ControlText(contents, new IArea(w2, y, w3, th), genome.getFertility() + "x", TextJustification.MiddleLeft); y += th; + float lifespan = genome.getLifespan() * 68.27f / genome.getAgeChance() / 24000.0f; new ControlText(contents, new IArea(0.0f, y, w2, th), "Lifespan : ", TextJustification.MiddleRight); new ControlText(contents, new IArea(w2, y, w3, th), "" + String.format("%.2f", lifespan) + " days", TextJustification.MiddleLeft); y += th; + new ControlText(contents, new IArea(0.0f, y, w2, th), "Nectar : ", TextJustification.MiddleRight); new ControlText(contents, new IArea(w2, y, w3, th), genome.getActiveAllele(EnumFlowerChromosome.SAPPINESS).getName(), TextJustification.MiddleLeft); y += th; + int x = w2; int tot = 0; for (IIndividual vid : BotanyCore.getFlowerRoot().getIndividualTemplates()) { @@ -88,10 +90,11 @@ public class PageSpeciesFlowerGenome extends PageSpecies { ItemStack stack = BotanyCore.getFlowerRoot().getMemberStack(vid, EnumFlowerStage.FLOWER.ordinal()); ControlItemDisplay display = new ControlItemDisplay(contents, x, y); display.setItemStack(stack); - ++tot; + tot++; x += 18; } } + int numOfLines = 1 + (tot - 1) / 3; new ControlText(contents, new IArea(0.0f, y - (numOfLines - 1) * 18, w2, 4 + 18 * numOfLines), "Varieties : ", TextJustification.MiddleRight); y += th; diff --git a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java index dcd464f9..a4fc7d0f 100644 --- a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java +++ b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java @@ -23,11 +23,10 @@ import cpw.mods.fml.relauncher.Side; import net.minecraft.entity.player.EntityPlayer; import java.util.ArrayList; +import java.util.Collections; import java.util.List; public class WindowBotanistDatabase extends WindowAbstractDatabase { - protected ControlListBox selectionBoxColors; - public WindowBotanistDatabase(EntityPlayer player, Side side, boolean nei) { super(player, side, nei, Binnie.Genetics.flowerBreedingSystem, 130.0f); } @@ -45,22 +44,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase { new PageSpeciesMutations(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.further", 0)); new PageBranchOverview(getInfoPages(Mode.Branches), new DatabaseTab(Botany.instance, "branches.overview", 0)); new PageBranchSpecies(getInfoPages(Mode.Branches), new DatabaseTab(Botany.instance, "branches.species", 0)); - createMode(FlowerMode.Colour, new ModeWidgets(FlowerMode.Colour, this) { - @Override - public void createListBox(IArea area) { - listBox = new ControlListBox(modePage, area.x(), area.y(), area.w(), area.h(), 12.0f) { - @Override - public IWidget createOption(IFlowerColor value, int y) { - return new ControlColorOption(getContent(), value, y); - } - }; - List colors = new ArrayList(); - for (IFlowerColor c : EnumFlowerColor.values()) { - colors.add(c); - } - listBox.setOptions(colors); - } - }); + createMode(FlowerMode.Colour, new ColorModeWidget()); new PageColorMixResultant(getInfoPages(FlowerMode.Colour), new DatabaseTab(Botany.instance, "colour.resultant", 0)); new PageColourMix(getInfoPages(FlowerMode.Colour), new DatabaseTab(Botany.instance, "colour.further", 0)); new PageBreeder(getInfoPages(Mode.Breeder), getUsername(), new DatabaseTab(Botany.instance, "breeder", 0)); @@ -73,7 +57,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase { @Override protected String getName() { - return "FlowerDatabase"; + return Binnie.I18N.localise(Botany.instance, "gui.database.name"); } enum FlowerMode implements IDatabaseMode { @@ -84,4 +68,23 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase { return Botany.proxy.localise("gui.database.mode." + name().toLowerCase()); } } + + private class ColorModeWidget extends ModeWidgets { + public ColorModeWidget() { + super(FlowerMode.Colour, WindowBotanistDatabase.this); + } + + @Override + public void createListBox(IArea area) { + listBox = new ControlListBox(modePage, area.x(), area.y(), area.w(), area.h(), 12.0f) { + @Override + public IWidget createOption(IFlowerColor value, int y) { + return new ControlColorOption(getContent(), value, y); + } + }; + List colors = new ArrayList<>(); + Collections.addAll(colors, EnumFlowerColor.values()); + listBox.setOptions(colors); + } + } } diff --git a/src/main/java/binnie/botany/farm/CircuitGarden.java b/src/main/java/binnie/botany/farm/CircuitGarden.java index 4c2a79e8..ced17f71 100644 --- a/src/main/java/binnie/botany/farm/CircuitGarden.java +++ b/src/main/java/binnie/botany/farm/CircuitGarden.java @@ -1,6 +1,7 @@ package binnie.botany.farm; import binnie.Binnie; +import binnie.botany.Botany; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; import binnie.core.circuits.BinnieCircuit; @@ -11,7 +12,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; public class CircuitGarden extends BinnieCircuit { - private Class logicClass; private boolean isManual; private boolean isFertilised; private ItemStack icon; @@ -28,32 +28,42 @@ public class CircuitGarden extends BinnieCircuit { String info = ""; if (moisture == EnumMoisture.Dry) { - info += EnumChatFormatting.YELLOW + "Dry" + EnumChatFormatting.RESET; + info += EnumChatFormatting.YELLOW + + Binnie.I18N.localise(Botany.instance, "moisture.dry") + + EnumChatFormatting.RESET; } if (moisture == EnumMoisture.Damp) { - info += EnumChatFormatting.YELLOW + "Damp" + EnumChatFormatting.RESET; + info += EnumChatFormatting.YELLOW + + Binnie.I18N.localise(Botany.instance, "moisture.damp") + + EnumChatFormatting.RESET; } if (acidity == EnumAcidity.Acid) { if (info.length() > 0) { info += ", "; } - info += EnumChatFormatting.RED + "Acidic" + EnumChatFormatting.RESET; + info += EnumChatFormatting.RED + + Binnie.I18N.localise(Botany.instance, "ph.acid") + + EnumChatFormatting.RESET; } if (acidity == EnumAcidity.Neutral) { if (info.length() > 0) { info += ", "; } - info += EnumChatFormatting.GREEN + "Neutral" + EnumChatFormatting.RESET; + info += EnumChatFormatting.GREEN + + Binnie.I18N.localise(Botany.instance, "ph.neutral") + + EnumChatFormatting.RESET; } if (acidity == EnumAcidity.Alkaline) { if (info.length() > 0) { info += ", "; } - info += EnumChatFormatting.AQUA + "Alkaline" + EnumChatFormatting.RESET; + info += EnumChatFormatting.AQUA + + Binnie.I18N.localise(Botany.instance, "ph.alkaline") + + EnumChatFormatting.RESET; } if (info.length() > 0) { @@ -72,8 +82,9 @@ public class CircuitGarden extends BinnieCircuit { if (!isCircuitable(tile)) { return; } + GardenLogic logic = new GardenLogic((IFarmHousing) tile); - logic.setData(moisture, acidity, isManual, isFertilised, icon, Binnie.Language.localise(getName())); + logic.setData(moisture, acidity, isManual, isFertilised, icon, Binnie.I18N.localise(getName())); ((IFarmHousing) tile).setFarmLogic(FarmDirection.values()[slot], logic); } @@ -92,6 +103,6 @@ public class CircuitGarden extends BinnieCircuit { @Override public void onTick(int arg0, Object arg1) { + // ignored } - } diff --git a/src/main/java/binnie/botany/farm/GardenLogic.java b/src/main/java/binnie/botany/farm/GardenLogic.java index 63042744..34c781bc 100644 --- a/src/main/java/binnie/botany/farm/GardenLogic.java +++ b/src/main/java/binnie/botany/farm/GardenLogic.java @@ -356,5 +356,4 @@ public class GardenLogic extends FarmLogic { icon = icon2; name = name2; } - } diff --git a/src/main/java/binnie/botany/farm/Vect.java b/src/main/java/binnie/botany/farm/Vect.java index 60f4809f..06f4072f 100644 --- a/src/main/java/binnie/botany/farm/Vect.java +++ b/src/main/java/binnie/botany/farm/Vect.java @@ -62,12 +62,10 @@ public class Vect { if (this == obj) { return true; } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { + if (obj == null || getClass() != obj.getClass()) { return false; } + Vect other = (Vect) obj; return x == other.x && y == other.y diff --git a/src/main/java/binnie/botany/flower/BlockFlower.java b/src/main/java/binnie/botany/flower/BlockFlower.java index 8bbf920c..782a205d 100644 --- a/src/main/java/binnie/botany/flower/BlockFlower.java +++ b/src/main/java/binnie/botany/flower/BlockFlower.java @@ -99,20 +99,22 @@ public class BlockFlower extends BlockContainer { @SideOnly(Side.CLIENT) public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { TileEntity tile = world.getTileEntity(x, y, z); - if (tile instanceof TileEntityFlower) { - TileEntityFlower f = (TileEntityFlower) tile; - EnumFlowerStage stage = (f.getAge() == 0) ? EnumFlowerStage.SEED : EnumFlowerStage.FLOWER; - IFlowerType flower = f.getType(); - int section = f.getRenderSection(); - boolean flowered = f.isFlowered(); - if (RendererBotany.pass == 0) { - return flower.getStem(stage, flowered, section); - } - return (RendererBotany.pass == 1) ? - flower.getPetalIcon(stage, flowered, section) : - flower.getVariantIcon(stage, flowered, section); + if (!(tile instanceof TileEntityFlower)) { + return super.getIcon(world, x, y, z, side); } - return super.getIcon(world, x, y, z, side); + + TileEntityFlower f = (TileEntityFlower) tile; + EnumFlowerStage stage = (f.getAge() == 0) ? EnumFlowerStage.SEED : EnumFlowerStage.FLOWER; + IFlowerType flower = f.getType(); + int section = f.getRenderSection(); + boolean flowered = f.isFlowered(); + if (RendererBotany.pass == 0) { + return flower.getStem(stage, flowered, section); + } + + return (RendererBotany.pass == 1) ? + flower.getPetalIcon(stage, flowered, section) : + flower.getVariantIcon(stage, flowered, section); } @Override @@ -133,7 +135,8 @@ public class BlockFlower extends BlockContainer { @Override public boolean canPlaceBlockAt(World world, int x, int y, int z) { - return super.canPlaceBlockAt(world, x, y, z) && canBlockStay(world, x, y, z); + return super.canPlaceBlockAt(world, x, y, z) + && canBlockStay(world, x, y, z); } protected boolean canPlaceBlockOn(Block block) { @@ -153,7 +156,11 @@ public class BlockFlower extends BlockContainer { } TileEntityFlower flower = (TileEntityFlower) tile; - if (flower.getSection() == 0 && flower.getFlower() != null && flower.getFlower().getAge() > 0 && flower.getFlower().getGenome().getPrimary().getType().getSections() > 1 && world.getBlock(x, y + 1, z) != Botany.flower) { + if (flower.getSection() == 0 + && flower.getFlower() != null + && flower.getFlower().getAge() > 0 + && flower.getFlower().getGenome().getPrimary().getType().getSections() > 1 + && world.getBlock(x, y + 1, z) != Botany.flower) { dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); world.setBlockToAir(x, y, z); } @@ -199,9 +206,8 @@ public class BlockFlower extends BlockContainer { return drops; } - // TODO remove deprecated @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { List drops = getDrops(world, x, y, z, world.getBlockMetadata(x, y, z), 0); boolean hasBeenBroken = world.setBlockToAir(x, y, z); if (hasBeenBroken && BinnieCore.proxy.isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) { diff --git a/src/main/java/binnie/botany/flower/ItemBotany.java b/src/main/java/binnie/botany/flower/ItemBotany.java index bf4978ed..8cbdd67f 100644 --- a/src/main/java/binnie/botany/flower/ItemBotany.java +++ b/src/main/java/binnie/botany/flower/ItemBotany.java @@ -3,11 +3,7 @@ package binnie.botany.flower; import binnie.Binnie; import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; -import binnie.botany.api.EnumFlowerChromosome; -import binnie.botany.api.EnumFlowerStage; -import binnie.botany.api.IAlleleFlowerSpecies; -import binnie.botany.api.IFlower; -import binnie.botany.api.IFlowerType; +import binnie.botany.api.*; import binnie.botany.core.BotanyCore; import binnie.botany.genetics.EnumFlowerType; import binnie.botany.genetics.Flower; @@ -59,14 +55,13 @@ public abstract class ItemBotany extends Item { return true; } - // TODO remove deprecated @Override - public boolean hasEffect(ItemStack itemstack) { - if (!itemstack.hasTagCompound()) { + public boolean hasEffect(ItemStack stack, int pass) { + if (!stack.hasTagCompound()) { return false; } - IIndividual individual = getIndividual(itemstack); + IIndividual individual = getIndividual(stack); return individual != null && individual.getGenome() != null && individual.hasEffect(); @@ -83,7 +78,12 @@ public abstract class ItemBotany extends Item { return; } - list.add(EnumChatFormatting.YELLOW + individual.getGenome().getPrimaryColor().getName() + ((individual.getGenome().getPrimaryColor() == individual.getGenome().getSecondaryColor()) ? "" : (" and " + individual.getGenome().getSecondaryColor().getName())) + ", " + individual.getGenome().getStemColor().getName() + " Stem"); + IFlowerGenome genome = individual.getGenome(); + IFlowerColor primaryColor = genome.getPrimaryColor(); + IFlowerColor secondColor = genome.getSecondaryColor(); + IFlowerColor stemColor = genome.getStemColor(); + list.add(EnumChatFormatting.YELLOW + primaryColor.getName() + ((primaryColor == secondColor) ? "" : (" and " + secondColor.getName())) + ", " + stemColor.getName() + " Stem"); + if (individual.isAnalyzed()) { if (BinnieCore.proxy.isShiftDown()) { individual.addTooltip(list); diff --git a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java index e7369c2f..cd4dc919 100644 --- a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java +++ b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java @@ -1,5 +1,6 @@ package binnie.botany.flower; +import binnie.Binnie; import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import cpw.mods.fml.relauncher.Side; @@ -33,26 +34,31 @@ public class ItemInsulatedTube extends Item { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item p_150895_1_, CreativeTabs p_150895_2_, List p_150895_3_) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for (Material mat : Material.values()) { for (Insulate ins : Insulate.values()) { - p_150895_3_.add(new ItemStack(this, 1, mat.ordinal() + ins.ordinal() * 128)); + list.add(new ItemStack(this, 1, mat.ordinal() + ins.ordinal() * 128)); } } } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister p_94581_1_) { + public void registerIcons(IIconRegister register) { for (int i = 0; i < 3; ++i) { - icons[i] = Botany.proxy.getIcon(p_94581_1_, "insulatedTube." + i); + icons[i] = Botany.proxy.getIcon(register, "insulatedTube." + i); } } @Override @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack stack, int pass) { - return (pass == 0) ? 16777215 : ((pass == 1) ? Material.get(stack.getItemDamage()).getColor() : Insulate.get(stack.getItemDamage()).getColor()); + if (pass == 0) { + return 0xffffff; + } + return (pass == 1) ? + Material.get(stack.getItemDamage()).getColor() : + Insulate.get(stack.getItemDamage()).getColor(); } @Override @@ -64,7 +70,8 @@ public class ItemInsulatedTube extends Item { @Override public String getItemStackDisplayName(ItemStack stack) { - return Material.get(stack.getItemDamage()).getName() + " Insulated Tube"; + return Material.get(stack.getItemDamage()).getName() + " " + + Binnie.I18N.localise(Botany.instance, "tube.name"); } @Override @@ -83,10 +90,10 @@ public class ItemInsulatedTube extends Item { } enum Material { - Copper(0xe3b78e, "Copper"), - Tin(0xe1eef4, "Tin"), - Bronze(0xddc276, "Bronze"), - Iron(0xd8d8d8, "Iron"); + Copper(0xe3b78e, "tube.cooper"), + Tin(0xe1eef4, "tube.tin"), + Bronze(0xddc276, "tube.bronze"), + Iron(0xd8d8d8, "tube.iron"); protected int color; protected String name; @@ -105,17 +112,17 @@ public class ItemInsulatedTube extends Item { } public String getName() { - return name; + return Binnie.I18N.localise(Botany.instance, name); } } enum Insulate { - Clay(0xa1aacc, "Clay"), - Cobble(0x7b7b7b, "Cobblestone"), - Sand(0xefeab5, "Sand"), - HardenedClay(0x935c43, "Hardened Clay"), - Stone(0x6d6d6d, "Smooth Stone"), - Sandstone(0xc1b989, "Sandstone"); + Clay(0xa1aacc, "tube.insulate.clay"), + Cobble(0x7b7b7b, "tube.insulate.cobblestone"), + Sand(0xefeab5, "tube.insulate.sand"), + HardenedClay(0x935c43, "tube.insulate.hardenedClay"), + Stone(0x6d6d6d, "tube.insulate.smoothStone"), + Sandstone(0xc1b989, "tube.insulate.sandstone"); protected int color; protected String name; @@ -134,7 +141,7 @@ public class ItemInsulatedTube extends Item { } public String getName() { - return name; + return Binnie.I18N.localise(Botany.instance, name); } public ItemStack getStack() { diff --git a/src/main/java/binnie/botany/gardening/BlockSoil.java b/src/main/java/binnie/botany/gardening/BlockSoil.java index cbd3e950..0f0574e3 100644 --- a/src/main/java/binnie/botany/gardening/BlockSoil.java +++ b/src/main/java/binnie/botany/gardening/BlockSoil.java @@ -54,11 +54,11 @@ public class BlockSoil extends Block implements IBlockSoil { } public static String getPH(ItemStack stack) { - return Binnie.Language.localise(EnumAcidity.values()[stack.getItemDamage() / 3]); + return Binnie.I18N.localise(EnumAcidity.values()[stack.getItemDamage() / 3]); } public static String getMoisture(ItemStack stack) { - return Binnie.Language.localise(EnumMoisture.values()[stack.getItemDamage() % 3]); + return Binnie.I18N.localise(EnumMoisture.values()[stack.getItemDamage() % 3]); } @Override diff --git a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java index 4f979e78..3b25837b 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java +++ b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java @@ -48,7 +48,7 @@ public class ItemSoilMeter extends Item { EnumChatFormatting.LIGHT_PURPLE, }; String info = "Type: "; - info += colors[type.ordinal()] + Binnie.Language.localise(type) + EnumChatFormatting.RESET; + info += colors[type.ordinal()] + Binnie.I18N.localise(type) + EnumChatFormatting.RESET; colors = new EnumChatFormatting[]{ EnumChatFormatting.YELLOW, @@ -56,7 +56,7 @@ public class ItemSoilMeter extends Item { EnumChatFormatting.BLUE, }; info += ", Moisture: "; - info += colors[moisture.ordinal()] + Binnie.Language.localise(moisture) + EnumChatFormatting.RESET; + info += colors[moisture.ordinal()] + Binnie.I18N.localise(moisture) + EnumChatFormatting.RESET; colors = new EnumChatFormatting[]{ EnumChatFormatting.RED, @@ -64,7 +64,7 @@ public class ItemSoilMeter extends Item { EnumChatFormatting.AQUA, }; info += ", pH: "; - info += colors[pH.ordinal()] + Binnie.Language.localise(pH) + EnumChatFormatting.RESET; + info += colors[pH.ordinal()] + Binnie.I18N.localise(pH) + EnumChatFormatting.RESET; IChatComponent chat = new ChatComponentText(info); player.addChatMessage(chat); } diff --git a/src/main/java/binnie/botany/items/ItemClay.java b/src/main/java/binnie/botany/items/ItemClay.java index 07aeea3d..f816f46d 100644 --- a/src/main/java/binnie/botany/items/ItemClay.java +++ b/src/main/java/binnie/botany/items/ItemClay.java @@ -1,5 +1,6 @@ package binnie.botany.items; +import binnie.Binnie; import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.botany.genetics.EnumFlowerColor; @@ -7,8 +8,10 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; import java.util.List; @@ -19,6 +22,12 @@ public class ItemClay extends Item { setCreativeTab(CreativeTabBotany.instance); } + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + super.addInformation(stack, player, tooltip, advanced); + tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(stack.getItemDamage()).getName()); + } + @Override @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack stack, int index) { @@ -28,7 +37,7 @@ public class ItemClay extends Item { @Override public String getItemStackDisplayName(ItemStack stack) { - return EnumFlowerColor.get(stack.getItemDamage()).getName() + " Clay"; + return Binnie.I18N.localise(Botany.instance, "item.clay.name"); } @Override diff --git a/src/main/java/binnie/botany/items/ItemPigment.java b/src/main/java/binnie/botany/items/ItemPigment.java index 27f10fa9..eb7698a2 100644 --- a/src/main/java/binnie/botany/items/ItemPigment.java +++ b/src/main/java/binnie/botany/items/ItemPigment.java @@ -1,5 +1,6 @@ package binnie.botany.items; +import binnie.Binnie; import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.botany.genetics.EnumFlowerColor; @@ -7,8 +8,10 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; import java.util.List; @@ -19,6 +22,12 @@ public class ItemPigment extends Item { setCreativeTab(CreativeTabBotany.instance); } + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + super.addInformation(stack, player, tooltip, advanced); + tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(stack.getItemDamage()).getName()); + } + @Override @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack stack, int index) { @@ -28,7 +37,7 @@ public class ItemPigment extends Item { @Override public String getItemStackDisplayName(ItemStack stack) { - return EnumFlowerColor.get(stack.getItemDamage()).getName() + " Pigment"; + return Binnie.I18N.localise(Botany.instance, "item.pigment.name"); } @Override diff --git a/src/main/java/binnie/core/block/BlockMetadata.java b/src/main/java/binnie/core/block/BlockMetadata.java index 6ed78c8a..c710344c 100644 --- a/src/main/java/binnie/core/block/BlockMetadata.java +++ b/src/main/java/binnie/core/block/BlockMetadata.java @@ -61,7 +61,7 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata { } @Override - public void getBlockTooltip(ItemStack itemStack, List tooltip) { + public void addBlockTooltip(ItemStack itemStack, List tooltip) { // ignored } diff --git a/src/main/java/binnie/core/block/IBlockMetadata.java b/src/main/java/binnie/core/block/IBlockMetadata.java index b0940bbd..98e5f762 100644 --- a/src/main/java/binnie/core/block/IBlockMetadata.java +++ b/src/main/java/binnie/core/block/IBlockMetadata.java @@ -14,7 +14,7 @@ public interface IBlockMetadata extends ITileEntityProvider { String getBlockName(ItemStack itemStack); - void getBlockTooltip(ItemStack itemStack, List tooltip); + void addBlockTooltip(ItemStack itemStack, List tooltip); void dropAsStack(World world, int x, int y, int z, ItemStack itemStack); } diff --git a/src/main/java/binnie/core/block/ItemMetadata.java b/src/main/java/binnie/core/block/ItemMetadata.java index 207e2373..a38b8b40 100644 --- a/src/main/java/binnie/core/block/ItemMetadata.java +++ b/src/main/java/binnie/core/block/ItemMetadata.java @@ -54,7 +54,7 @@ public class ItemMetadata extends ItemBlock { @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) { - ((IBlockMetadata) field_150939_a).getBlockTooltip(itemStack, tooltip); + ((IBlockMetadata) field_150939_a).addBlockTooltip(itemStack, tooltip); } @Override diff --git a/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java b/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java index eedffb78..d6ca751b 100644 --- a/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java +++ b/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java @@ -24,12 +24,12 @@ public class BinnieCircuitLayout implements ICircuitLayout { @Override public String getName() { - return Binnie.Language.localise(mod, "circuit.layout." + uid.toLowerCase()); + return Binnie.I18N.localise(mod, "circuit.layout." + uid.toLowerCase()); } @Override public String getUsage() { - return Binnie.Language.localise(mod, "circuit.layout." + uid.toLowerCase() + ".usage"); + return Binnie.I18N.localise(mod, "circuit.layout." + uid.toLowerCase() + ".usage"); } @Override diff --git a/src/main/java/binnie/core/craftgui/WindowFieldKit.java b/src/main/java/binnie/core/craftgui/WindowFieldKit.java index 1c5beb1e..72474e9a 100644 --- a/src/main/java/binnie/core/craftgui/WindowFieldKit.java +++ b/src/main/java/binnie/core/craftgui/WindowFieldKit.java @@ -194,8 +194,8 @@ public class WindowFieldKit extends Window { List infos = new ArrayList<>(); int i = 0; - for (String pref = root.getUID() + ".fieldkit." + type.getName().toLowerCase() + "."; Binnie.Language.canLocalise(pref + i); ++i) { - infos.add(Binnie.Language.localise(pref + i)); + for (String pref = root.getUID() + ".fieldkit." + type.getName().toLowerCase() + "."; Binnie.I18N.canLocalise(pref + i); ++i) { + infos.add(Binnie.I18N.localise(pref + i)); } String text = Binnie.Genetics.getSystem(root).getAlleleName(type, allele); diff --git a/src/main/java/binnie/core/craftgui/database/DatabaseTab.java b/src/main/java/binnie/core/craftgui/database/DatabaseTab.java index 9039fe1b..f32554a0 100644 --- a/src/main/java/binnie/core/craftgui/database/DatabaseTab.java +++ b/src/main/java/binnie/core/craftgui/database/DatabaseTab.java @@ -18,11 +18,11 @@ public class DatabaseTab implements ITooltipHelp { @Override public String toString() { - return Binnie.Language.localise(mod, "gui.database.tab." + unloc); + return Binnie.I18N.localise(mod, "gui.database.tab." + unloc); } @Override public void getHelpTooltip(Tooltip tooltip) { - tooltip.add(Binnie.Language.localiseOrBlank(mod, "gui.database.tab." + unloc + ".help")); + tooltip.add(Binnie.I18N.localiseOrBlank(mod, "gui.database.tab." + unloc + ".help")); } } diff --git a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java index 22865ea7..61425202 100644 --- a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java @@ -56,16 +56,16 @@ class BeeBreedingSystem extends BreedingSystem { public String getAlleleName(IChromosomeType chromosome, IAllele allele) { if (chromosome == EnumBeeChromosome.FERTILITY) { if (allele.getUID().contains("Low")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.low"); + return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.low"); } if (allele.getUID().contains("Normal")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.normal"); + return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.normal"); } if (allele.getUID().contains("High")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.high"); + return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.high"); } if (allele.getUID().contains("Maximum")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.maximum"); + return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.maximum"); } } return super.getAlleleName(chromosome, allele); diff --git a/src/main/java/binnie/core/genetics/BreedingSystem.java b/src/main/java/binnie/core/genetics/BreedingSystem.java index e2aa1828..2df9152d 100644 --- a/src/main/java/binnie/core/genetics/BreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BreedingSystem.java @@ -421,11 +421,11 @@ public abstract class BreedingSystem implements IItemStackRepresentative { public String getAlleleName(IChromosomeType chromosome, IAllele allele) { if (allele instanceof IAlleleBoolean) { return ((IAlleleBoolean) allele).getValue() ? - Binnie.Language.localise(BinnieCore.instance, "allele.true") : - Binnie.Language.localise(BinnieCore.instance, "allele.false"); + Binnie.I18N.localise(BinnieCore.instance, "allele.true") : + Binnie.I18N.localise(BinnieCore.instance, "allele.false"); } if (allele.getName() == "for.gui.maximum") { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.maximum"); + return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.maximum"); } return allele.getName(); } diff --git a/src/main/java/binnie/core/genetics/EnumBeeModifier.java b/src/main/java/binnie/core/genetics/EnumBeeModifier.java index 62d2d64d..922fd48e 100644 --- a/src/main/java/binnie/core/genetics/EnumBeeModifier.java +++ b/src/main/java/binnie/core/genetics/EnumBeeModifier.java @@ -12,6 +12,6 @@ public enum EnumBeeModifier { GeneticDecay; public String getName() { - return Binnie.Language.localise(BinnieCore.instance, "beemodifier." + name().toLowerCase()); + return Binnie.I18N.localise(BinnieCore.instance, "beemodifier." + name().toLowerCase()); } } diff --git a/src/main/java/binnie/core/genetics/FlowerBreedingSystem.java b/src/main/java/binnie/core/genetics/FlowerBreedingSystem.java index 087e86e9..cd9184e9 100644 --- a/src/main/java/binnie/core/genetics/FlowerBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/FlowerBreedingSystem.java @@ -50,16 +50,16 @@ class FlowerBreedingSystem extends BreedingSystem { public String getAlleleName(IChromosomeType chromosome, IAllele allele) { if (chromosome == EnumFlowerChromosome.FERTILITY) { if (allele.getUID().contains("Low")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.low"); + return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.low"); } if (allele.getUID().contains("Normal")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.normal"); + return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.normal"); } if (allele.getUID().contains("High")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.high"); + return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.high"); } if (allele.getUID().contains("Maximum")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.maximum"); + return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.maximum"); } } return super.getAlleleName(chromosome, allele); diff --git a/src/main/java/binnie/core/genetics/IBreedingMessage.java b/src/main/java/binnie/core/genetics/IBreedingMessage.java index 060589de..3b21c940 100644 --- a/src/main/java/binnie/core/genetics/IBreedingMessage.java +++ b/src/main/java/binnie/core/genetics/IBreedingMessage.java @@ -35,7 +35,7 @@ interface IBreedingMessage { @Override public String getTitle() { - return Binnie.Language.localise(BinnieCore.instance, "gui.breedingmessage.species"); + return Binnie.I18N.localise(BinnieCore.instance, "gui.breedingmessage.species"); } @Override @@ -70,7 +70,7 @@ interface IBreedingMessage { @Override public String getTitle() { - return Binnie.Language.localise(BinnieCore.instance, "gui.breedingmessage.branch"); + return Binnie.I18N.localise(BinnieCore.instance, "gui.breedingmessage.branch"); } @Override @@ -95,7 +95,7 @@ interface IBreedingMessage { @Override public String getTitle() { - return Binnie.Language.localise(BinnieCore.instance, "gui.breedingmessage.epithet"); + return Binnie.I18N.localise(BinnieCore.instance, "gui.breedingmessage.epithet"); } @Override diff --git a/src/main/java/binnie/core/genetics/MothBreedingSystem.java b/src/main/java/binnie/core/genetics/MothBreedingSystem.java index c537d520..63802e61 100644 --- a/src/main/java/binnie/core/genetics/MothBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/MothBreedingSystem.java @@ -49,24 +49,24 @@ class MothBreedingSystem extends BreedingSystem { if (chromosome == EnumButterflyChromosome.METABOLISM) { int metabolism = ((IAlleleInteger) allele).getValue(); if (metabolism >= 19) { - return Binnie.Language.localise(BinnieCore.instance, "allele.metabolism.highest"); + return Binnie.I18N.localise(BinnieCore.instance, "allele.metabolism.highest"); } if (metabolism >= 16) { - return Binnie.Language.localise(BinnieCore.instance, "allele.metabolism.higher"); + return Binnie.I18N.localise(BinnieCore.instance, "allele.metabolism.higher"); } if (metabolism >= 13) { - return Binnie.Language.localise(BinnieCore.instance, "allele.metabolism.high"); + return Binnie.I18N.localise(BinnieCore.instance, "allele.metabolism.high"); } if (metabolism >= 10) { - return Binnie.Language.localise(BinnieCore.instance, "allele.metabolism.normal"); + return Binnie.I18N.localise(BinnieCore.instance, "allele.metabolism.normal"); } if (metabolism >= 7) { - return Binnie.Language.localise(BinnieCore.instance, "allele.metabolism.slow"); + return Binnie.I18N.localise(BinnieCore.instance, "allele.metabolism.slow"); } if (metabolism >= 4) { - return Binnie.Language.localise(BinnieCore.instance, "allele.metabolism.slower"); + return Binnie.I18N.localise(BinnieCore.instance, "allele.metabolism.slower"); } - return Binnie.Language.localise(BinnieCore.instance, "allele.metabolism.slowest"); + return Binnie.I18N.localise(BinnieCore.instance, "allele.metabolism.slowest"); } if (chromosome == EnumButterflyChromosome.FERTILITY) { return ((IAlleleInteger) allele).getValue() + "x"; diff --git a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java index d040884f..51defb6a 100644 --- a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java @@ -88,23 +88,23 @@ public class TreeBreedingSystem extends BreedingSystem { if (chromosome == EnumTreeChromosome.PLANT) { EnumSet types = ((IAllelePlantType) allele).getPlantTypes(); return types.isEmpty() ? - Binnie.Language.localise(BinnieCore.instance, "allele.none") : + Binnie.I18N.localise(BinnieCore.instance, "allele.none") : types.iterator().next().toString(); } if (chromosome == EnumTreeChromosome.FRUITS && allele.getUID().contains(".")) { IFruitProvider provider = ((IAlleleFruit) allele).getProvider(); return (provider.getProducts().length == 0) ? - Binnie.Language.localise(BinnieCore.instance, "allele.none") : + Binnie.I18N.localise(BinnieCore.instance, "allele.none") : provider.getProducts()[0].getDisplayName(); } if (chromosome == EnumTreeChromosome.GROWTH) { if (allele.getUID().contains("Tropical")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.growth.tropical"); + return Binnie.I18N.localise(BinnieCore.instance, "allele.growth.tropical"); } if (allele.getUID().contains("Lightlevel")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.growth.lightlevel"); + return Binnie.I18N.localise(BinnieCore.instance, "allele.growth.lightlevel"); } } return super.getAlleleName(chromosome, allele); diff --git a/src/main/java/binnie/core/machines/MachinePackage.java b/src/main/java/binnie/core/machines/MachinePackage.java index 15b33f41..9b80e6c8 100644 --- a/src/main/java/binnie/core/machines/MachinePackage.java +++ b/src/main/java/binnie/core/machines/MachinePackage.java @@ -27,7 +27,7 @@ public abstract class MachinePackage { public abstract TileEntity createTileEntity(); public String getDisplayName() { - return Binnie.Language.localise(group.getMod(), "machine." + group.getShortUID() + "." + getUID()); + return Binnie.I18N.localise(group.getMod(), "machine." + group.getShortUID() + "." + getUID()); } public Integer getMetadata() { @@ -57,6 +57,6 @@ public abstract class MachinePackage { } public String getInformation() { - return Binnie.Language.localise(group.getMod(), "machine." + group.getShortUID() + "." + getUID() + ".info"); + return Binnie.I18N.localise(group.getMod(), "machine." + group.getShortUID() + "." + getUID() + ".info"); } } diff --git a/src/main/java/binnie/core/machines/inventory/InventorySlot.java b/src/main/java/binnie/core/machines/inventory/InventorySlot.java index a4c0e8a2..2f492e50 100644 --- a/src/main/java/binnie/core/machines/inventory/InventorySlot.java +++ b/src/main/java/binnie/core/machines/inventory/InventorySlot.java @@ -92,7 +92,7 @@ public class InventorySlot extends BaseSlot { @Override public String getName() { - return Binnie.Language.localise(BinnieCore.instance, "gui.slot." + unlocName); + return Binnie.I18N.localise(BinnieCore.instance, "gui.slot." + unlocName); } public enum Type { diff --git a/src/main/java/binnie/core/machines/inventory/TankSlot.java b/src/main/java/binnie/core/machines/inventory/TankSlot.java index 5c907cb5..c6340497 100644 --- a/src/main/java/binnie/core/machines/inventory/TankSlot.java +++ b/src/main/java/binnie/core/machines/inventory/TankSlot.java @@ -48,6 +48,6 @@ public class TankSlot extends BaseSlot { @Override public String getName() { - return Binnie.Language.localise(BinnieCore.instance, "gui.slot." + unlocName); + return Binnie.I18N.localise(BinnieCore.instance, "gui.slot." + unlocName); } } diff --git a/src/main/java/binnie/core/proxy/BinnieModProxy.java b/src/main/java/binnie/core/proxy/BinnieModProxy.java index 21e032aa..1b2efe27 100644 --- a/src/main/java/binnie/core/proxy/BinnieModProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieModProxy.java @@ -60,10 +60,10 @@ public class BinnieModProxy implements IBinnieModProxy { } public String localise(String string) { - return Binnie.Language.localise(mod, string); + return Binnie.I18N.localise(mod, string); } public String localiseOrBlank(String string) { - return Binnie.Language.localiseOrBlank(mod, string); + return Binnie.I18N.localiseOrBlank(mod, string); } } diff --git a/src/main/java/binnie/extratrees/alcohol/Glassware.java b/src/main/java/binnie/extratrees/alcohol/Glassware.java index 334ed872..33af2de3 100644 --- a/src/main/java/binnie/extratrees/alcohol/Glassware.java +++ b/src/main/java/binnie/extratrees/alcohol/Glassware.java @@ -41,7 +41,7 @@ public enum Glassware { if (liquid == null) { return ExtraTrees.proxy.localise("item.glassware." + name().toLowerCase()); } - return Binnie.Language.localise(ExtraTrees.instance, "item.glassware." + name().toLowerCase() + ".usage", liquid); + return Binnie.I18N.localise(ExtraTrees.instance, "item.glassware." + name().toLowerCase() + ".usage", liquid); } public int getCapacity() { diff --git a/src/main/java/binnie/extratrees/block/BlockBranch.java b/src/main/java/binnie/extratrees/block/BlockBranch.java index bd1fad2f..8cc460e3 100644 --- a/src/main/java/binnie/extratrees/block/BlockBranch.java +++ b/src/main/java/binnie/extratrees/block/BlockBranch.java @@ -113,7 +113,7 @@ public class BlockBranch extends BlockLog implements IBlockMetadata { } @Override - public void getBlockTooltip(ItemStack itemStack, List tooltip) { + public void addBlockTooltip(ItemStack itemStack, List tooltip) { // ignored } diff --git a/src/main/java/binnie/extratrees/block/BlockETDoor.java b/src/main/java/binnie/extratrees/block/BlockETDoor.java index c682368e..82c8360d 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDoor.java +++ b/src/main/java/binnie/extratrees/block/BlockETDoor.java @@ -194,13 +194,13 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { String typeName = getDoorType(meta).getName(); String woodName = WoodManager.getPlankType(meta & 0xFF).getName(); if (typeName.equals("")) { - return Binnie.Language.localise(ExtraTrees.instance, "block.door.name", woodName); + return Binnie.I18N.localise(ExtraTrees.instance, "block.door.name", woodName); } - return Binnie.Language.localise(ExtraTrees.instance, "block.door.name.adv", woodName, typeName); + return Binnie.I18N.localise(ExtraTrees.instance, "block.door.name.adv", woodName, typeName); } @Override - public void getBlockTooltip(ItemStack itemStack, List tooltip) { + public void addBlockTooltip(ItemStack itemStack, List tooltip) { // ignored } diff --git a/src/main/java/binnie/extratrees/block/BlockETLog.java b/src/main/java/binnie/extratrees/block/BlockETLog.java index 4857256d..0b7f98b0 100644 --- a/src/main/java/binnie/extratrees/block/BlockETLog.java +++ b/src/main/java/binnie/extratrees/block/BlockETLog.java @@ -129,11 +129,11 @@ public class BlockETLog extends BlockLog implements IBlockMetadata { @Override public String getBlockName(ItemStack itemStack) { int meta = TileEntityMetadata.getItemDamage(itemStack); - return Binnie.Language.localise(ExtraTrees.instance, "block.log.name", ILogType.ExtraTreeLog.values()[meta].getName()); + return Binnie.I18N.localise(ExtraTrees.instance, "block.log.name", ILogType.ExtraTreeLog.values()[meta].getName()); } @Override - public void getBlockTooltip(ItemStack itemStack, List tooltip) { + public void addBlockTooltip(ItemStack itemStack, List tooltip) { } @Override diff --git a/src/main/java/binnie/extratrees/block/BlockETPlanks.java b/src/main/java/binnie/extratrees/block/BlockETPlanks.java index 5018fe16..91f1a8dd 100644 --- a/src/main/java/binnie/extratrees/block/BlockETPlanks.java +++ b/src/main/java/binnie/extratrees/block/BlockETPlanks.java @@ -74,11 +74,11 @@ public class BlockETPlanks extends BlockWood implements IBlockMetadata { @Override public String getBlockName(ItemStack itemStack) { int meta = TileEntityMetadata.getItemDamage(itemStack); - return Binnie.Language.localise(ExtraTrees.instance, "block.plank.name", PlankType.ExtraTreePlanks.values()[meta].getName()); + return Binnie.I18N.localise(ExtraTrees.instance, "block.plank.name", PlankType.ExtraTreePlanks.values()[meta].getName()); } @Override - public void getBlockTooltip(ItemStack itemStack, List tooltip) { + public void addBlockTooltip(ItemStack itemStack, List tooltip) { // ignored } diff --git a/src/main/java/binnie/extratrees/block/BlockETSlab.java b/src/main/java/binnie/extratrees/block/BlockETSlab.java index d2778194..dcd4dec5 100644 --- a/src/main/java/binnie/extratrees/block/BlockETSlab.java +++ b/src/main/java/binnie/extratrees/block/BlockETSlab.java @@ -82,11 +82,11 @@ public class BlockETSlab extends BlockWoodSlab implements IBlockMetadata { @Override public String getBlockName(ItemStack itemStack) { int meta = TileEntityMetadata.getItemDamage(itemStack); - return Binnie.Language.localise(ExtraTrees.instance, "block.woodslab.name", PlankType.ExtraTreePlanks.values()[meta].getName()); + return Binnie.I18N.localise(ExtraTrees.instance, "block.woodslab.name", PlankType.ExtraTreePlanks.values()[meta].getName()); } @Override - public void getBlockTooltip(ItemStack itemStack, List tooltip) { + public void addBlockTooltip(ItemStack itemStack, List tooltip) { } @Override diff --git a/src/main/java/binnie/extratrees/block/BlockETStairs.java b/src/main/java/binnie/extratrees/block/BlockETStairs.java index 69f903ce..ac4291e5 100644 --- a/src/main/java/binnie/extratrees/block/BlockETStairs.java +++ b/src/main/java/binnie/extratrees/block/BlockETStairs.java @@ -106,11 +106,11 @@ public class BlockETStairs extends BlockStairs implements IBlockMetadata { @Override public String getBlockName(ItemStack itemStack) { int meta = TileEntityMetadata.getItemDamage(itemStack); - return Binnie.Language.localise(ExtraTrees.instance, "block.woodstairs.name", WoodManager.getPlankType(meta + 32).getName()); + return Binnie.I18N.localise(ExtraTrees.instance, "block.woodstairs.name", WoodManager.getPlankType(meta + 32).getName()); } @Override - public void getBlockTooltip(ItemStack itemStack, List tooltip) { + public void addBlockTooltip(ItemStack itemStack, List tooltip) { } @Override diff --git a/src/main/java/binnie/extratrees/block/decor/BlockFence.java b/src/main/java/binnie/extratrees/block/decor/BlockFence.java index 7aad8b3c..cb460f40 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockFence.java @@ -121,11 +121,11 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock @Override public String getBlockName(ItemStack itemStack) { int meta = TileEntityMetadata.getItemDamage(itemStack); - return Binnie.Language.localise(ExtraTrees.instance, "block.woodfence.name", getDescription(meta).getPlankType().getName()); + return Binnie.I18N.localise(ExtraTrees.instance, "block.woodfence.name", getDescription(meta).getPlankType().getName()); } @Override - public void getBlockTooltip(ItemStack itemStack, List tooltip) { + public void addBlockTooltip(ItemStack itemStack, List tooltip) { } @Override diff --git a/src/main/java/binnie/extratrees/block/decor/BlockGate.java b/src/main/java/binnie/extratrees/block/decor/BlockGate.java index 7933c527..3c6fa210 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockGate.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockGate.java @@ -104,11 +104,11 @@ public class BlockGate extends BlockFenceGate implements IBlockMetadata { @Override public String getBlockName(ItemStack itemStack) { int meta = TileEntityMetadata.getItemDamage(itemStack); - return Binnie.Language.localise(ExtraTrees.instance, "block.woodgate.name", WoodManager.getPlankType(meta).getName()); + return Binnie.I18N.localise(ExtraTrees.instance, "block.woodgate.name", WoodManager.getPlankType(meta).getName()); } @Override - public void getBlockTooltip(ItemStack itemStack, List tooltip) { + public void addBlockTooltip(ItemStack itemStack, List tooltip) { } @Override diff --git a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java index 84245586..f1ac9db2 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java @@ -40,6 +40,6 @@ public class BlockMultiFence extends BlockFence implements IBlockMetadata { IPlankType type2 = getDescription(meta).getSecondaryPlankType(); boolean twoTypes = type1 != type2; FenceType type3 = getDescription(meta).getFenceType(); - return Binnie.Language.localise(ExtraTrees.instance, "block.woodslab.name" + (twoTypes ? "2" : ""), type3.getPrefix(), type1.getName(), type2.getName()); + return Binnie.I18N.localise(ExtraTrees.instance, "block.woodslab.name" + (twoTypes ? "2" : ""), type3.getPrefix(), type1.getName(), type2.getName()); } } diff --git a/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java b/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java index 636f6c7a..ebc41cd3 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java @@ -26,7 +26,7 @@ public class BlockCarpentry extends BlockDesign { @Override public String getBlockName(DesignBlock design) { - return Binnie.Language.localise(ExtraTrees.instance, "block.woodentile.name", design.getDesign().getName()); + return Binnie.I18N.localise(ExtraTrees.instance, "block.woodentile.name", design.getDesign().getName()); } } diff --git a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java index 9e429d15..9a537d4f 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java @@ -85,7 +85,7 @@ public class BlockCarpentryPanel extends BlockCarpentry { @Override public String getBlockName(ItemStack stack) { DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); - return Binnie.Language.localise(ExtraTrees.instance, "block.woodenpanel.name", block.getDesign().getName()); + return Binnie.I18N.localise(ExtraTrees.instance, "block.woodenpanel.name", block.getDesign().getName()); } @Override diff --git a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java index 1fb3dff9..b630fe20 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java @@ -101,8 +101,8 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo return getBlockName(block); } - public abstract String getBlockName(DesignBlock p0); - + public abstract String getBlockName(DesignBlock design); + public DesignBlock getCarpentryBlock(IBlockAccess world, int x, int y, int z) { return ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getTileMetadata(world, x, y, z)); } @@ -130,7 +130,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo } @Override - public void getBlockTooltip(ItemStack stack, List tooltip) { + public void addBlockTooltip(ItemStack stack, List tooltip) { DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); if (block.getPrimaryMaterial() != block.getSecondaryMaterial()) { tooltip.add(block.getPrimaryMaterial().getName() + " and " + block.getSecondaryMaterial().getName()); diff --git a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java index 76804045..e993052e 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java @@ -59,6 +59,6 @@ public class BlockStainedDesign extends BlockDesign { @Override public String getBlockName(DesignBlock design) { - return Binnie.Language.localise(ExtraTrees.instance, "block.stainedglass.name", design.getDesign().getName()); + return Binnie.I18N.localise(ExtraTrees.instance, "block.stainedglass.name", design.getDesign().getName()); } } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/ControlTileSelect.java b/src/main/java/binnie/extratrees/craftgui/dictionary/ControlTileSelect.java index c9869e23..c29e0e56 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/ControlTileSelect.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/ControlTileSelect.java @@ -144,7 +144,7 @@ public class ControlTileSelect extends Control implements IControlValue @Override public void getTooltip(Tooltip tooltip) { - tooltip.add(Binnie.Language.localise(BinnieCore.instance, "gui.designer.pattern", getValue().getName())); + tooltip.add(Binnie.I18N.localise(BinnieCore.instance, "gui.designer.pattern", getValue().getName())); } @Override diff --git a/src/main/java/binnie/genetics/gui/AnalystPageSoil.java b/src/main/java/binnie/genetics/gui/AnalystPageSoil.java index 0a53d0da..7941abd6 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageSoil.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageSoil.java @@ -107,7 +107,7 @@ public class AnalystPageSoil extends ControlAnalystPage { new ControlToleranceBar(parent, x, y, w, h, EnumMoisture.class) { @Override protected String getName(EnumMoisture value) { - return Binnie.Language.localise(value); + return Binnie.I18N.localise(value); } @Override @@ -121,7 +121,7 @@ public class AnalystPageSoil extends ControlAnalystPage { new ControlToleranceBar(parent, x, y, w, h, EnumAcidity.class) { @Override protected String getName(EnumAcidity value) { - return Binnie.Language.localise(value); + return Binnie.I18N.localise(value); } @Override diff --git a/src/main/resources/assets/botany/lang/en_GB.lang b/src/main/resources/assets/botany/lang/en_GB.lang index 4cad51a6..0810c641 100644 --- a/src/main/resources/assets/botany/lang/en_GB.lang +++ b/src/main/resources/assets/botany/lang/en_GB.lang @@ -1,5 +1,18 @@ botany.tab.botany=Botany +botany.pigmentedGlass=Pigmented Glass +botany.ceramicBlock=Ceramic Block +botany.ceramicTile=Ceramic Tile +botany.ceramicBricks=Ceramic Bricks +botany.strippedCeramicBricks=Striped Ceramic Bricks +botany.largeCeramicBricks=Large Ceramic Bricks +botany.splitCeramicTile=Split Ceramic Tile +botany.chequeredCeramicTile=Chequered Ceramic Tile +botany.mixedCeramicTile=Mixed Ceramic Tile +botany.verticalCeramicBricks=Vertical Ceramic Bricks +botany.verticalStripedCeramicBricks=Vertical Striped Ceramic Bricks +botany.largeVerticalCeramicBricks=Large Vertical Ceramic Bricks + botany.ph.acid=Acidic botany.ph.neutral=Neutral botany.ph.alkaline=Alkaline @@ -12,12 +25,15 @@ botany.soil.soil=Soil botany.soil.loam=Loam botany.soil.flowerbed=Flowerbed +botany.item.pigment.name=Pigment +botany.item.clay.name=Clay item.trowelWood.name=Wooden Trowel item.trowelStone.name=Stone Trowel item.trowelIron.name=Iron Trowel item.trowelGold.name=Gold Trowel item.trowelDiamond.name=Diamond Trowel +botany.colour.double=%s & %s botany.colour.aquamarine=Aquamarine botany.colour.black=Black botany.colour.blue=Deep Blue @@ -148,7 +164,23 @@ for.binnie.circuit.garden.damp.acid=Garden (Damp, Acidic) for.binnie.circuit.garden.damp.neutral=Garden (Damp, Neutral) for.binnie.circuit.garden.damp.alkaline=Garden (Damp, Alkaline) +botany.tube.name=Insulated Tube +botany.tube.cooper=Cooper +botany.tube.tin=Tin +botany.tube.bronze=Bronze +botany.tube.iron=Iron +botany.tube.insulate.clay=Clay +botany.tube.insulate.cobblestone=Cobblestone +botany.tube.insulate.sand=Sand +botany.tube.insulate.hardenedClay=Hardened Clay +botany.tube.insulate.smoothStone=Smooth Stone +botany.tube.insulate.sandstone=Sandstone +botany.gui.controls.colorMixSymbol.chance=Current Chance - %f% +botany.gui.controls.pageSpeciesFurtherTitle=Resultant Mixes +botany.gui.controls.pageColorFurtherTitle=Further Mixes + +botany.gui.database.name=FlowerDatabase botany.gui.database.tab.species.overview=Overview botany.gui.database.tab.species.genome=Genome botany.gui.database.tab.species.classification=Classification diff --git a/src/main/resources/assets/botany/lang/en_US.lang b/src/main/resources/assets/botany/lang/en_US.lang index dfa66284..0a07054c 100644 --- a/src/main/resources/assets/botany/lang/en_US.lang +++ b/src/main/resources/assets/botany/lang/en_US.lang @@ -1,5 +1,18 @@ botany.tab.botany=Botany +botany.pigmentedGlass=Pigmented Glass +botany.ceramicBlock=Ceramic Block +botany.ceramicTile=Ceramic Tile +botany.ceramicBricks=Ceramic Bricks +botany.strippedCeramicBricks=Striped Ceramic Bricks +botany.largeCeramicBricks=Large Ceramic Bricks +botany.splitCeramicTile=Split Ceramic Tile +botany.chequeredCeramicTile=Chequered Ceramic Tile +botany.mixedCeramicTile=Mixed Ceramic Tile +botany.verticalCeramicBricks=Vertical Ceramic Bricks +botany.verticalStripedCeramicBricks=Vertical Striped Ceramic Bricks +botany.largeVerticalCeramicBricks=Large Vertical Ceramic Bricks + botany.ph.acid=Acidic botany.ph.neutral=Neutral botany.ph.alkaline=Alkaline @@ -12,12 +25,16 @@ botany.soil.soil=Soil botany.soil.loam=Loam botany.soil.flowerbed=Flowerbed +botany.item.pigment.name=Pigment +botany.item.clay.name=Clay item.trowelWood.name=Wooden Trowel item.trowelStone.name=Stone Trowel item.trowelIron.name=Iron Trowel item.trowelGold.name=Gold Trowel item.trowelDiamond.name=Diamond Trowel +botany.colour.double=%s & %s +botany.colour.aquamarine=Aquamarine botany.colour.aquamarine=Aquamarine botany.colour.black=Black botany.colour.blue=Deep Blue @@ -148,7 +165,23 @@ for.binnie.circuit.garden.damp.acid=Garden (Damp, Acidic) for.binnie.circuit.garden.damp.neutral=Garden (Damp, Neutral) for.binnie.circuit.garden.damp.alkaline=Garden (Damp, Alkaline) +botany.tube.name=Insulated Tube +botany.tube.cooper=Cooper +botany.tube.tin=Tin +botany.tube.bronze=Bronze +botany.tube.iron=Iron +botany.tube.insulate.clay=Clay +botany.tube.insulate.cobblestone=Cobblestone +botany.tube.insulate.sand=Sand +botany.tube.insulate.hardenedClay=Hardened Clay +botany.tube.insulate.smoothStone=Smooth Stone +botany.tube.insulate.sandstone=Sandstone +botany.gui.controls.colorMixSymbol.chance=Current Chance - %f% +botany.gui.controls.pageSpeciesFurtherTitle=Resultant Mixes +botany.gui.controls.pageColorFurtherTitle=Further Mixes + +botany.gui.database.name=FlowerDatabase botany.gui.database.tab.species.overview=Overview botany.gui.database.tab.species.genome=Genome botany.gui.database.tab.species.classification=Classification diff --git a/src/main/resources/assets/botany/lang/ru_RU.lang b/src/main/resources/assets/botany/lang/ru_RU.lang index 23a9311f..5edb4e3c 100644 --- a/src/main/resources/assets/botany/lang/ru_RU.lang +++ b/src/main/resources/assets/botany/lang/ru_RU.lang @@ -1,5 +1,18 @@ botany.tab.botany=Botany +botany.pigmentedGlass=Крашеное стекло +botany.ceramicBlock=Керамический блок +botany.ceramicTile=Керамическая плитка +botany.ceramicBricks=Керамический кирпич +botany.strippedCeramicBricks=Полосатый керамический кирпич +botany.largeCeramicBricks=Длинный керамический кирпич +botany.splitCeramicTile=Разделенная керамическая плитка +botany.chequeredCeramicTile=Шахматная керамическая плитка +botany.mixedCeramicTile=Обрамленная керамическая плитка +botany.verticalCeramicBricks=Вертикальный керамический кирпич +botany.verticalStripedCeramicBricks=Вертикальная полосатая керамическая плитка +botany.largeVerticalCeramicBricks=Длинный вертикальный керамический кирпич + botany.ph.acid=Кислотный botany.ph.neutral=Нейтральный botany.ph.alkaline=Щелочной @@ -12,12 +25,15 @@ botany.soil.soil=Почва botany.soil.loam=Суглинок botany.soil.flowerbed=Цветник +botany.item.pigment.name=Краситель +botany.item.clay.name=Глиняный порошок item.trowelWood.name=Деревянный совок item.trowelStone.name=Каменный совок item.trowelIron.name=Железный совок item.trowelGold.name=Золотой совок item.trowelDiamond.name=Алмазный совок +botany.colour.double=%s - %s botany.colour.aquamarine=Аквамарин (цвет морской волны) botany.colour.black=Чёрный botany.colour.blue=Глубоко-синий @@ -148,7 +164,23 @@ for.binnie.circuit.garden.damp.acid=Garden (влажный, кислый) for.binnie.circuit.garden.damp.neutral=Garden (влажный, средний) for.binnie.circuit.garden.damp.alkaline=Garden (влажный, щелочной) +botany.tube.name=изолирующая лампа +botany.tube.cooper=Медная +botany.tube.tin=Оловяная +botany.tube.bronze=Бронзовая +botany.tube.iron=Железная +botany.tube.insulate.clay=Глина +botany.tube.insulate.cobblestone=Булыжник +botany.tube.insulate.sand=Песок +botany.tube.insulate.hardenedClay=Твердая глина +botany.tube.insulate.smoothStone=Гладкий камень +botany.tube.insulate.sandstone=Песчаник +botany.gui.controls.colorMixSymbol.chance=Текущий шанс - %f% +botany.gui.controls.pageSpeciesFurtherTitle=Результат +botany.gui.controls.pageColorFurtherTitle=Дополнительные смеси + +botany.gui.database.name=База данных цветов botany.gui.database.tab.species.overview=Обзор botany.gui.database.tab.species.genome=Генотип botany.gui.database.tab.species.classification=Классификация