diff --git a/lang b/lang index e9fdd790d..53cf0a2d4 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit e9fdd790dcba503656f2a9cdb6b4a4cb8e8421c9 +Subproject commit 53cf0a2d43862ebf535ccac346919227ca1b706c diff --git a/src/main/java/forestry/core/items/ItemBlockForestry.java b/src/main/java/forestry/core/items/ItemBlockForestry.java index 20058feb5..7801c0ef8 100644 --- a/src/main/java/forestry/core/items/ItemBlockForestry.java +++ b/src/main/java/forestry/core/items/ItemBlockForestry.java @@ -18,6 +18,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; + import forestry.core.blocks.IBlockWithMeta; import forestry.core.tiles.TileForestry; import forestry.core.tiles.TileUtil; @@ -51,7 +52,7 @@ public class ItemBlockForestry extends ItemBlock { } return block.getUnlocalizedName(); } - + @Override public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState newState) { boolean placed = super.placeBlockAt(stack, player, world, pos, side, hitX, hitY, hitZ, newState); diff --git a/src/main/java/forestry/energy/blocks/BlockRegistryEnergy.java b/src/main/java/forestry/energy/blocks/BlockRegistryEnergy.java index 816fa4295..a39ef3d60 100644 --- a/src/main/java/forestry/energy/blocks/BlockRegistryEnergy.java +++ b/src/main/java/forestry/energy/blocks/BlockRegistryEnergy.java @@ -11,12 +11,12 @@ package forestry.energy.blocks; import forestry.core.blocks.BlockRegistry; -import forestry.core.items.ItemBlockForestry; +import forestry.energy.items.ItemEngine; public class BlockRegistryEnergy extends BlockRegistry { public final BlockEngine engine; public BlockRegistryEnergy() { - engine = registerBlock(new BlockEngine(), ItemBlockForestry.class, "engine"); + engine = registerBlock(new BlockEngine(), ItemEngine.class, "engine"); } } diff --git a/src/main/java/forestry/energy/items/ItemEngine.java b/src/main/java/forestry/energy/items/ItemEngine.java new file mode 100644 index 000000000..2e2bf3907 --- /dev/null +++ b/src/main/java/forestry/energy/items/ItemEngine.java @@ -0,0 +1,30 @@ +package forestry.energy.items; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +import forestry.core.items.ItemBlockForestry; +import forestry.core.utils.Translator; +import forestry.energy.blocks.BlockEngine; + +public class ItemEngine extends ItemBlockForestry { + + public ItemEngine(Block block) { + super(block); + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { + super.addInformation(stack, playerIn, tooltip, advanced); + String unlocalizedName = getUnlocalizedName(stack); + String tooltipKey = unlocalizedName + ".tooltip"; + String tooltipInfo = Translator.translateToLocal(tooltipKey); + Minecraft minecraft = Minecraft.getMinecraft(); + List tooltipInfoWrapped = minecraft.fontRendererObj.listFormattedStringToWidth(tooltipInfo, 150); + tooltip.addAll(tooltipInfoWrapped); + } +}