diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index d5d51839..dfc8d49b 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -516,6 +516,7 @@ item.enderio.itemConduitProbe.tooltip.detailed.line5=R-Click to paste them item.enderio.itemConduitProbe.tooltip.detailed.line6=Use Shift-Mouse Wheel or 'Y' to change mode item.itemSoulVessel.name=Soul Vial +enderio.item.itemSoulVessel.tooltip.health=Health: enderio.item.itemSoulVessel.tooltip.fluidname=Fluid Name: item.itemSoulVessel.tooltip.detailed.line1=R-Click on a mob to item.itemSoulVessel.tooltip.detailed.line2=capture its soul diff --git a/src/main/java/crazypants/enderio/item/ItemSoulVessel.java b/src/main/java/crazypants/enderio/item/ItemSoulVessel.java index 1e2de73b..782f3cbd 100644 --- a/src/main/java/crazypants/enderio/item/ItemSoulVessel.java +++ b/src/main/java/crazypants/enderio/item/ItemSoulVessel.java @@ -17,7 +17,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; import net.minecraft.util.Facing; import net.minecraft.util.IIcon; import net.minecraft.world.World; @@ -270,7 +272,7 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider { if(!containsSoul(item)) { return null; } - if(item == null || item.stackTagCompound == null || !item.stackTagCompound.hasKey("id")) { + if(item.stackTagCompound == null || !item.stackTagCompound.hasKey("id")) { return null; } return item.stackTagCompound.getString("id"); @@ -281,12 +283,50 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider { if(!containsSoul(item)) { return null; } - if(item == null || item.stackTagCompound == null || !item.stackTagCompound.hasKey("FluidName")) { + if(!item.stackTagCompound.hasKey("FluidName")) { return null; } return item.stackTagCompound.getString("FluidName"); } + public float getHealthFromStack(ItemStack item) { + if(!containsSoul(item)) { + return Float.NaN; + } + if(!item.stackTagCompound.hasKey("HealF")) { + return Float.NaN; + } + return item.stackTagCompound.getFloat("HealF"); + } + + public NBTTagCompound getAttributeFromStack(ItemStack item, String name) { + if(!containsSoul(item)) { + return null; + } + NBTBase tag = item.stackTagCompound.getTag("Attributes"); + if(tag instanceof NBTTagList) { + NBTTagList attributes = (NBTTagList)tag; + for(int i=0 ; i= 0) { + float maxHealth = getMaxHealthFromStack(par1ItemStack); + String msg = Lang.localize("item.itemSoulVessel.tooltip.health"); + if(maxHealth >= 0) { + par3List.add(String.format("%s %3.1f/%3.1f", msg, health, maxHealth)); + } else { + par3List.add(String.format("%s %3.1f", msg, health)); + } + } + String fluidName = getFluidNameFromStack(par1ItemStack); if(fluidName != null) { Fluid fluid = FluidRegistry.getFluid(fluidName); diff --git a/src/main/java/crazypants/enderio/machine/tank/TileTank.java b/src/main/java/crazypants/enderio/machine/tank/TileTank.java index 1e669a2c..33dd5d56 100644 --- a/src/main/java/crazypants/enderio/machine/tank/TileTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/TileTank.java @@ -123,7 +123,10 @@ public class TileTank extends AbstractMachineEntity implements IFluidHandler { if(!canFill(from)) { return 0; } + return fillInternal(resource, doFill); + } + private int fillInternal(FluidStack resource, boolean doFill) { int res = tank.fill(resource, doFill); if(res > 0 && doFill) { tankDirty = true; @@ -329,11 +332,11 @@ public class TileTank extends AbstractMachineEntity implements IFluidHandler { } } - int filled = fill(ForgeDirection.UP, fluid, false); + int filled = fillInternal(fluid, false); if(filled < fluid.amount) { return false; //can't empty the entire thing } - fill(ForgeDirection.UP, fluid, true); + fillInternal(fluid, true); fillFrom = fillFrom.copy(); fillFrom.stackSize--;