diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java index 88f535cbb..ee4289184 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java @@ -16,6 +16,8 @@ import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase; import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; import de.ellpeck.actuallyadditions.mod.tile.TileEntityFurnaceDouble; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -160,7 +162,7 @@ public class BlockFurnaceDouble extends BlockContainerBase{ @Override public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced){ - tooltip.add(TextFormatting.ITALIC+"Previously Double Furnace"); + tooltip.add(TextFormatting.ITALIC+StringUtil.localize("tooltip."+ModUtil.MOD_ID+".previouslyDoubleFurnace")); } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java index 723de3085..2612d51db 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBag.java @@ -16,6 +16,8 @@ import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler.GuiTypes; import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; import de.ellpeck.actuallyadditions.mod.tile.FilterSettings; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -26,6 +28,7 @@ import net.minecraft.util.EnumActionResult; 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 net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; @@ -34,6 +37,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; +import java.util.List; + public class ItemBag extends ItemBase{ private final boolean isVoid; @@ -48,6 +53,11 @@ public class ItemBag extends ItemBase{ } } + @Override + public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced){ + tooltip.add(TextFormatting.ITALIC+StringUtil.localize("tooltip."+ModUtil.MOD_ID+".previously"+(this.isVoid ? "VoidBag" : "Bag"))); + } + @SubscribeEvent public void onItemPickup(EntityItemPickupEvent event){ EntityPlayer player = event.getEntityPlayer(); diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 2fccefe2d..a7fa225b9 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -518,8 +518,8 @@ item.actuallyadditions.itemMiscBiomass.name=Biomass item.actuallyadditions.itemMiscBiocoal.name=Bio Coal item.actuallyadditions.itemPlayerProbe.name=Player Probe item.actuallyadditions.itemWorm.name=Worm -item.actuallyadditions.itemBag.name=Bag -item.actuallyadditions.itemVoidBag.name=Void Bag +item.actuallyadditions.itemBag.name=Traveler's Sack +item.actuallyadditions.itemVoidBag.name=Void Sack #Tooltips tooltip.actuallyadditions.onSuffix.desc=On @@ -557,6 +557,9 @@ tooltip.actuallyadditions.playerProbe.notice=Look out! Someone tried to probe yo tooltip.actuallyadditions.battery.discharge=Charging other items in inventory tooltip.actuallyadditions.battery.noDischarge=Not charging other items in inventory tooltip.actuallyadditions.battery.changeMode=Sneak-right-click to toggle. +tooltip.actuallyadditions.previouslyDoubleFurnace=Previously "Double Furnace" +tooltip.actuallyadditions.previouslyBag=Previously "Bag" +tooltip.actuallyadditions.previouslyVoidBag=Previously "Void Bag" #Gui Information info.actuallyadditions.gui.animals=Animals @@ -635,8 +638,8 @@ container.actuallyadditions.rangedCollector.name=Ranged Collector container.actuallyadditions.miner.name=Vertical Digger container.actuallyadditions.laserRelayItemWhitelist.name=Laser Relay container.actuallyadditions.filter.name=Item Filter -container.actuallyadditions.bag.name=Bag -container.actuallyadditions.voidBag.name=Void Bag +container.actuallyadditions.bag.name=Traveler's Sack +container.actuallyadditions.voidBag.name=Void Sack #Update Information info.actuallyadditions.update.generic=[{"text":"There is an Update for "},{"text":"Actually Additions ","color":"dark_green"},{"text":"available!","color":"none"}] @@ -1013,9 +1016,9 @@ booklet.actuallyadditions.chapter.worms.name=Worms booklet.actuallyadditions.chapter.worms.text.1=The Worms are a pretty useful species. They will, once placed down on dirt or grass, help you till the land around them in a 3x3 area and keep it wet. Additionally, they will help the crops grow faster by making the ground nice and soft. Worms can be gotten by simply tilling grass with a hoe. booklet.actuallyadditions.chapter.worms.text.2=A worm at work -booklet.actuallyadditions.chapter.bags.name=Bag and Void Bag -booklet.actuallyadditions.chapter.bags.text.1=Bags are an easy way to transport items around, however, they have some additional functions. First of all, in their GUI that is accessed by right-clicking, they can be set to automatically suck up items on the ground. Also, they have a couple of filter slots where you can configure what can actually go into the bags. Void Bags have the same functionality as normal bags, however, they remove items from the world instead of storing them. -booklet.actuallyadditions.chapter.bags.text.2=Additionally, Bags can be, when filled up with a lot of items, right-clicked on a container like a Chest or a Storage Crate to quickly move all of the items in the bag into the chest. +booklet.actuallyadditions.chapter.bags.name=Traveler's Sack and Void Sack +booklet.actuallyadditions.chapter.bags.text.1=Sacks are an easy way to transport items around, however, they have some additional functions. First of all, in their GUI that is accessed by right-clicking, they can be set to automatically suck up items on the ground. Also, they have a couple of filter slots where you can configure what can actually go into the sacks. Void Sacks have the same functionality as normal ones, however, they remove items from the world instead of storing them. +booklet.actuallyadditions.chapter.bags.text.2=Additionally, Sacks can be, when filled up with a lot of items, right-clicked on a container like a Chest or a Storage Crate to quickly move all of the items in the sack into the chest. booklet.actuallyadditions.chapter.empowerer.name=Empowerer booklet.actuallyadditions.chapter.empowerer.text.1=The Empowerer is a mid-tier block that can be used to empower crystals and other items. To use it, items that should be empowered can be right-clicked onto the Empowerer, and empowering items need to be placed on Display Stands that are two blocks away, like seen in the picture on the next page. To then activate the process, every Display Stand needs to be powered with a lot of RF that is then drained to empower the item on the Empowerer.