A few fixes, need to fix an output issue

This commit is contained in:
Aidan C. Brady committed 2015-03-04 13:04:32 -05:00
1 parent 5747c9f904
commit af4c1c6cd7
10 files changed
+157 -69

No files matched your search

@@ -6,6 +6,8 @@ import java.util.List;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.api.Range4D;
import mekanism.api.energy.IEnergizedItem;
import mekanism.api.energy.IStrictEnergyStorage;
import mekanism.common.Mekanism;
import mekanism.common.MekanismBlocks;
import mekanism.common.Tier.BaseTier;
@@ -16,11 +18,13 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.tile.TileEntityBin;
import mekanism.common.tile.TileEntityInductionCell;
import mekanism.common.tile.TileEntityInductionProvider;
import mekanism.common.util.MekanismUtils;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
@@ -52,7 +56,7 @@ import cpw.mods.fml.relauncher.SideOnly;
* @author AidanBrady
*
*/
public class ItemBlockBasic extends ItemBlock
public class ItemBlockBasic extends ItemBlock implements IEnergizedItem
{
public Block metaBlock;
@@ -83,20 +87,6 @@ public class ItemBlockBasic extends ItemBlock
itemstack.stackTagCompound.setInteger("tier", tier.ordinal());
}
@Override
public int getItemStackLimit(ItemStack stack)
{
if(Block.getBlockFromItem(this) == MekanismBlocks.BasicBlock)
{
if(stack.getItemDamage() == 6)
{
return 1;
}
}
return 64;
}
@Override
public int getMetadata(int i)
{
@@ -126,6 +116,11 @@ public class ItemBlockBasic extends ItemBlock
list.add(EnumColor.DARK_RED + "Empty");
}
}
if(getMaxEnergy(itemstack) > 0)
{
list.add(EnumColor.BRIGHT_GREEN + MekanismUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack)));
}
}
@Override
@@ -215,6 +210,13 @@ public class ItemBlockBasic extends ItemBlock
}
}
}
TileEntity tileEntity = world.getTileEntity(x, y, z);
if(tileEntity instanceof IStrictEnergyStorage)
{
((IStrictEnergyStorage)tileEntity).setEnergy(getEnergy(stack));
}
}
return place;
@@ -306,4 +308,69 @@ public class ItemBlockBasic extends ItemBlock
return getUnlocalizedName() + "." + name;
}
@Override
public double getEnergy(ItemStack itemStack)
{
if(Block.getBlockFromItem(this) == MekanismBlocks.BasicBlock2 && itemStack.getItemDamage() == 3)
{
if(itemStack.stackTagCompound == null)
{
return 0;
}
return itemStack.stackTagCompound.getDouble("energyStored");
}
return 0;
}
@Override
public void setEnergy(ItemStack itemStack, double amount)
{
if(Block.getBlockFromItem(this) == MekanismBlocks.BasicBlock2 && itemStack.getItemDamage() == 3)
{
if(itemStack.stackTagCompound == null)
{
itemStack.setTagCompound(new NBTTagCompound());
}
itemStack.stackTagCompound.setDouble("energyStored", Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0));
}
}
@Override
public double getMaxEnergy(ItemStack itemStack)
{
if(Block.getBlockFromItem(this) == MekanismBlocks.BasicBlock2 && itemStack.getItemDamage() == 3)
{
return InductionCellTier.values()[getTier(itemStack).ordinal()].MAX_ELECTRICITY;
}
return 0;
}
@Override
public double getMaxTransfer(ItemStack itemStack)
{
return 0;
}
@Override
public boolean canReceive(ItemStack itemStack)
{
return false;
}
@Override
public boolean canSend(ItemStack itemStack)
{
return false;
}
@Override
public boolean isMetadataSpecific(ItemStack itemStack)
{
return true;
}
}