Added button to remove upgrade, fixed font size. Almost done!

This commit is contained in:
Aidan C. Brady committed 2014-07-22 22:16:20 -04:00
1 parent 790cd33f2d
commit 523ec21467
4 files changed
+51 -34

No files matched your search

@@ -2,9 +2,10 @@ package mekanism.common.network;
import io.netty.buffer.ByteBuf;
import mekanism.api.Coord4D;
import mekanism.common.IUpgradeManagement;
import mekanism.common.IUpgradeTile;
import mekanism.common.Mekanism;
import mekanism.common.PacketHandler;
import mekanism.common.Upgrade;
import mekanism.common.network.PacketRemoveUpgrade.RemoveUpgradeMessage;
import mekanism.common.tile.TileEntityBasicBlock;
import net.minecraft.entity.player.EntityPlayer;
@@ -22,28 +23,16 @@ public class PacketRemoveUpgrade implements IMessageHandler<RemoveUpgradeMessage
EntityPlayer player = PacketHandler.getPlayer(context);
TileEntity tileEntity = message.coord4D.getTileEntity(player.worldObj);
if(tileEntity instanceof IUpgradeManagement && tileEntity instanceof TileEntityBasicBlock)
if(tileEntity instanceof IUpgradeTile && tileEntity instanceof TileEntityBasicBlock)
{
IUpgradeManagement upgradeTile = (IUpgradeManagement)tileEntity;
IUpgradeTile upgradeTile = (IUpgradeTile)tileEntity;
Upgrade upgrade = Upgrade.values()[message.upgradeType];
if(message.upgradeType == 0)
if(upgradeTile.getComponent().getUpgrades(upgrade) > 0)
{
if(upgradeTile.getSpeedMultiplier() > 0)
if(player.inventory.addItemStackToInventory(upgrade.getStack()))
{
if(player.inventory.addItemStackToInventory(new ItemStack(Mekanism.SpeedUpgrade)))
{
upgradeTile.setSpeedMultiplier(upgradeTile.getSpeedMultiplier()-1);
}
}
}
else if(message.upgradeType == 1)
{
if(upgradeTile.getEnergyMultiplier() > 0)
{
if(player.inventory.addItemStackToInventory(new ItemStack(Mekanism.EnergyUpgrade)))
{
upgradeTile.setEnergyMultiplier(upgradeTile.getEnergyMultiplier()-1);
}
upgradeTile.getComponent().removeUpgrade(upgrade);
}
}
}
@@ -55,11 +44,11 @@ public class PacketRemoveUpgrade implements IMessageHandler<RemoveUpgradeMessage
{
public Coord4D coord4D;
public byte upgradeType;
public int upgradeType;
public RemoveUpgradeMessage() {}
public RemoveUpgradeMessage(Coord4D coord, byte type)
public RemoveUpgradeMessage(Coord4D coord, int type)
{
coord4D = coord;
upgradeType = type;
@@ -73,7 +62,7 @@ public class PacketRemoveUpgrade implements IMessageHandler<RemoveUpgradeMessage
dataStream.writeInt(coord4D.zCoord);
dataStream.writeInt(coord4D.dimensionId);
dataStream.writeByte(upgradeType);
dataStream.writeInt(upgradeType);
}
@Override
@@ -81,7 +70,7 @@ public class PacketRemoveUpgrade implements IMessageHandler<RemoveUpgradeMessage
{
coord4D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt());
upgradeType = dataStream.readByte();
upgradeType = dataStream.readInt();
}
}
}