diff --git a/CHANGELOG.md b/CHANGELOG.md index 217ca0f77..fcf381d44 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ### 1.0.6 - Added crafting preview screen (way2muchnoise) - Added max crafting task depth (raoulvdberge) +- Added helpful tooltips to Solderer and Processing Pattern Encoder (raoulvdberge) ### 1.0.5 - Fixed crafting a complex item causes the process to flow off the Crafting Monitor's GUI (raoulvdberge) diff --git a/src/main/java/refinedstorage/block/BlockProcessingPatternEncoder.java b/src/main/java/refinedstorage/block/BlockProcessingPatternEncoder.java index d9c0199e7..a80e702be 100755 --- a/src/main/java/refinedstorage/block/BlockProcessingPatternEncoder.java +++ b/src/main/java/refinedstorage/block/BlockProcessingPatternEncoder.java @@ -1,22 +1,34 @@ package refinedstorage.block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileProcessingPatternEncoder; +import java.util.List; + public class BlockProcessingPatternEncoder extends BlockBase { public BlockProcessingPatternEncoder() { super("processing_pattern_encoder"); } + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + super.addInformation(stack, player, tooltip, advanced); + + tooltip.add(I18n.format("block.refinedstorage:processing_pattern_encoder.tooltip.0")); + tooltip.add(I18n.format("block.refinedstorage:processing_pattern_encoder.tooltip.1", TextFormatting.WHITE + I18n.format("block.refinedstorage:grid.2.name") + TextFormatting.GRAY)); + } + @Override public boolean hasTileEntity(IBlockState state) { return true; diff --git a/src/main/java/refinedstorage/block/BlockSolderer.java b/src/main/java/refinedstorage/block/BlockSolderer.java index 7cd5aab75..f4b3d82f1 100755 --- a/src/main/java/refinedstorage/block/BlockSolderer.java +++ b/src/main/java/refinedstorage/block/BlockSolderer.java @@ -3,6 +3,7 @@ package refinedstorage.block; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -10,12 +11,15 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextFormatting; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileSolderer; +import java.util.List; + public class BlockSolderer extends BlockNode { private static final AxisAlignedBB AABB_SOLDERER = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 14D / 16D, 1.0D); @@ -30,6 +34,17 @@ public class BlockSolderer extends BlockNode { return new TileSolderer(); } + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + super.addInformation(stack, player, tooltip, advanced); + + tooltip.add(I18n.format( + "block.refinedstorage:solderer.tooltip", + TextFormatting.WHITE + I18n.format("block.refinedstorage:controller.0.name") + TextFormatting.GRAY, + TextFormatting.WHITE + I18n.format("block.refinedstorage:cable.name") + TextFormatting.GRAY + )); + } + @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { if (!world.isRemote) { diff --git a/src/main/java/refinedstorage/item/ItemWirelessGrid.java b/src/main/java/refinedstorage/item/ItemWirelessGrid.java index 3b161d39b..70060b95b 100755 --- a/src/main/java/refinedstorage/item/ItemWirelessGrid.java +++ b/src/main/java/refinedstorage/item/ItemWirelessGrid.java @@ -101,6 +101,8 @@ public class ItemWirelessGrid extends ItemEnergyContainer implements ISpecialEle @Override public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + super.addInformation(stack, player, tooltip, advanced); + if (stack.getItemDamage() != TYPE_CREATIVE) { tooltip.add(I18n.format("misc.refinedstorage:energy_stored", getEnergyStored(stack), getMaxEnergyStored(stack))); } diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang index 2d1371b39..5db74dbd5 100755 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -130,6 +130,7 @@ block.refinedstorage:exporter.name=Exporter block.refinedstorage:detector.name=Detector block.refinedstorage:machine_casing.name=Machine Casing block.refinedstorage:solderer.name=Solderer +block.refinedstorage:solderer.tooltip=Needs to be connected with a %s by placing it adjacent to it or by connecting it with %s. block.refinedstorage:destructor.name=Destructor block.refinedstorage:constructor.name=Constructor block.refinedstorage:storage.0.name=1k Storage Block @@ -143,6 +144,8 @@ block.refinedstorage:crafting_monitor.name=Crafting Monitor block.refinedstorage:wireless_transmitter.name=Wireless Transmitter block.refinedstorage:crafter.name=Crafter block.refinedstorage:processing_pattern_encoder.name=Processing Pattern Encoder +block.refinedstorage:processing_pattern_encoder.tooltip.0=Only used for creating processing patterns. +block.refinedstorage:processing_pattern_encoder.tooltip.1=For regular crafting pattern creation, use the %s. block.refinedstorage:network_receiver.name=Network Receiver block.refinedstorage:network_transmitter.name=Network Transmitter block.refinedstorage:fluid_interface.name=Fluid Interface