tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

update lang file

Browse source
This commit is contained in:
DarkGuardsman 2013-12-04 14:05:36 -05:00
parent 14ce020223
commit 1e25feee01
3 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
resources/assets/dark/languages/en_US.properties
View file

@ -177,10 +177,13 @@ tile.basaltcracked.name = Cracked Basalt Bricks
tile.BlockSolarPanel.0.name = Solar Panel tile.BlockSolarPanel.0.name = Solar Panel
tile.BasicMachine.0.name = tile.DMEnergyStorage.0.name = Battery Box
tile.BasicMachine.4.name = tile.DMEnergyStorage.1.name = Capacitor Box
tile.BasicMachine.8.name =
tile.BasicMachine.12.name = tile.BasicMachine.0.name =
tile.BasicMachine.4.name =
tile.BasicMachine.8.name =
tile.BasicMachine.12.name =
tile.StarterSteamGen.0.name = Small Steam Turbine tile.StarterSteamGen.0.name = Small Steam Turbine
tile.StarterSteamGen.4.name = Small Steam Piston tile.StarterSteamGen.4.name = Small Steam Piston
@ -202,6 +205,10 @@ item.ValvePart.name=Valve
item.DMTools.0.name=Pipe Gauge item.DMTools.0.name=Pipe Gauge
item.DMTools.1.name=MultiMeter item.DMTools.1.name=MultiMeter
item.FluidCan.name = Fluid Can
item.wrench.name = Wrench
item.GlowRefinedSand.Black.name = Black Glowing Refined Sand item.GlowRefinedSand.Black.name = Black Glowing Refined Sand
item.GlowRefinedSand.Red.name = Red Glowing Refined Sand item.GlowRefinedSand.Red.name = Red Glowing Refined Sand
item.GlowRefinedSand.Green.name = Green Glowing Refined Sand item.GlowRefinedSand.Green.name = Green Glowing Refined Sand

2
src/dark/machines/items/ItemFluidCan.java
View file

@ -32,6 +32,7 @@ public class ItemFluidCan extends ItemFluidContainer
public ItemFluidCan() public ItemFluidCan()
{ {
super(DarkMain.CONFIGURATION.getItem("FluidCan", ModPrefab.getNextItemId()).getInt()); super(DarkMain.CONFIGURATION.getItem("FluidCan", ModPrefab.getNextItemId()).getInt());
this.setUnlocalizedName("FluidCan");
this.setCreativeTab(DMCreativeTab.tabHydrualic); this.setCreativeTab(DMCreativeTab.tabHydrualic);
this.setMaxStackSize(1); this.setMaxStackSize(1);
this.setMaxDamage(100); this.setMaxDamage(100);
@ -63,6 +64,7 @@ public class ItemFluidCan extends ItemFluidContainer
return ("" + (fluid + " " + StatCollector.translateToLocal(this.getUnlocalizedNameInefficiently(par1ItemStack) + ".name"))).trim(); return ("" + (fluid + " " + StatCollector.translateToLocal(this.getUnlocalizedNameInefficiently(par1ItemStack) + ".name"))).trim();
} }
@Override
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4)
{ {
FluidStack fluidStack = this.drain(par1ItemStack, Integer.MAX_VALUE, false); FluidStack fluidStack = this.drain(par1ItemStack, Integer.MAX_VALUE, false);

12
src/dark/machines/machines/ItemBlockEnergyStorage.java
View file

@ -1,5 +1,7 @@
package dark.machines.machines; package dark.machines.machines;
import java.util.List;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
@ -7,6 +9,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidStack;
import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.Vector3;
import dark.machines.CoreRecipeLoader; import dark.machines.CoreRecipeLoader;
@ -28,6 +31,15 @@ public class ItemBlockEnergyStorage extends ItemBlock
return damage; return damage;
} }
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4)
{
if (stack.getTagCompound() != null && stack.getTagCompound().hasKey("wrenched"))
{
list.add("Energy: " + stack.getTagCompound().getFloat("energy"));
}
}
@Override @Override
public String getUnlocalizedName(ItemStack itemStack) public String getUnlocalizedName(ItemStack itemStack)
{ {