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

Added EM Contractor coloring

Browse source
This commit is contained in:
Calclavia 2013-08-04 13:01:54 -04:00
parent 54fd6b4d2f
commit 9ebbb2fb0c
3 changed files with 47 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/resonantinduction/CommonProxy.java
View file

@ -39,7 +39,7 @@ public class CommonProxy implements IGuiHandler
{
return null;
}
public boolean isPaused()
{
return false;
@ -50,6 +50,11 @@ public class CommonProxy implements IGuiHandler
}
public void renderElectricShock(World world, Vector3 start, Vector3 target, Vector3 color)
{
this.renderElectricShock(world, start, target, (float) color.x, (float) color.y, (float) color.z);
}
public void renderElectricShock(World world, Vector3 start, Vector3 target)
{
renderElectricShock(world, start, target, 0.55f, 0.7f, 1f);

13
src/resonantinduction/contractor/BlockEMContractor.java
View file

@ -4,6 +4,7 @@ import net.minecraft.block.ITileEntityProvider;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
@ -37,7 +38,17 @@ public class BlockEMContractor extends BlockBase implements ITileEntityProvider
if (entityPlayer.getCurrentEquippedItem() != null)
{
if (entityPlayer.getCurrentEquippedItem().getItem() instanceof ItemCoordLink)
if (entityPlayer.getCurrentEquippedItem().itemID == Item.dyePowder.itemID)
{
contractor.setDye(entityPlayer.getCurrentEquippedItem().getItemDamage());
if (!entityPlayer.capabilities.isCreativeMode)
{
entityPlayer.inventory.decrStackSize(entityPlayer.inventory.currentItem, 1);
}
return true;
}
else if (entityPlayer.getCurrentEquippedItem().getItem() instanceof ItemCoordLink)
{
ItemCoordLink link = ((ItemCoordLink) entityPlayer.getCurrentEquippedItem().getItem());
Vector3 linkVec = link.getLink(entityPlayer.getCurrentEquippedItem());

41
src/resonantinduction/contractor/TileEntityEMContractor.java
View file

@ -20,6 +20,7 @@ import resonantinduction.base.IPacketReceiver;
import resonantinduction.base.InventoryUtil;
import resonantinduction.base.TileEntityBase;
import resonantinduction.base.Vector3;
import resonantinduction.tesla.TileEntityTesla;
import com.google.common.io.ByteArrayDataInput;
@ -54,6 +55,9 @@ public class TileEntityEMContractor extends TileEntityBase implements IPacketRec
private Set<EntityItem> pathfindingTrackers = new HashSet<EntityItem>();
public TileEntityEMContractor linked;
/** Color of beam */
private int dyeID = 13;
@Override
public void updateEntity()
{
@ -115,7 +119,7 @@ public class TileEntityEMContractor extends TileEntityBase implements IPacketRec
if (i - 1 >= 0)
{
Vector3 prevResult = this.pathfinder.results.get(i - 1);
ResonantInduction.proxy.renderElectricShock(this.worldObj, prevResult.translate(0.5), result.translate(0.5));
ResonantInduction.proxy.renderElectricShock(this.worldObj, prevResult.translate(0.5), result.translate(0.5), TileEntityTesla.dyeColors[dyeID]);
Vector3 difference = prevResult.difference(result);
final ForgeDirection direction = difference.toForgeDirection();
@ -149,7 +153,7 @@ public class TileEntityEMContractor extends TileEntityBase implements IPacketRec
{
if (this.worldObj.isRemote && this.ticks % 5 == 0)
{
ResonantInduction.proxy.renderElectricShock(this.worldObj, new Vector3(this).translate(0.5), new Vector3(entityItem));
ResonantInduction.proxy.renderElectricShock(this.worldObj, new Vector3(this).translate(0.5), new Vector3(entityItem), TileEntityTesla.dyeColors[dyeID]);
}
this.moveEntity(entityItem, this.getFacing(), new Vector3(this));
@ -395,25 +399,27 @@ public class TileEntityEMContractor extends TileEntityBase implements IPacketRec
}
@Override
public void readFromNBT(NBTTagCompound nbtTags)
public void readFromNBT(NBTTagCompound nbt)
{
super.readFromNBT(nbtTags);
super.readFromNBT(nbt);
facing = ForgeDirection.getOrientation(nbtTags.getInteger("facing"));
suck = nbtTags.getBoolean("suck");
energyStored = nbtTags.getFloat("energyStored");
this.facing = ForgeDirection.getOrientation(nbt.getInteger("facing"));
this.suck = nbt.getBoolean("suck");
this.energyStored = nbt.getFloat("energyStored");
this.dyeID = nbt.getInteger("dyeID");
updateBounds();
}
@Override
public void writeToNBT(NBTTagCompound nbtTags)
public void writeToNBT(NBTTagCompound nbt)
{
super.writeToNBT(nbtTags);
super.writeToNBT(nbt);
nbtTags.setInteger("facing", facing.ordinal());
nbtTags.setBoolean("suck", suck);
nbtTags.setFloat("energyStored", energyStored);
nbt.setInteger("facing", facing.ordinal());
nbt.setBoolean("suck", suck);
nbt.setFloat("energyStored", energyStored);
nbt.setInteger("dyeID", this.dyeID);
}
@Override
@ -424,6 +430,7 @@ public class TileEntityEMContractor extends TileEntityBase implements IPacketRec
facing = ForgeDirection.getOrientation(input.readInt());
suck = input.readBoolean();
energyStored = input.readFloat();
this.dyeID = input.readInt();
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
updateBounds();
@ -439,6 +446,7 @@ public class TileEntityEMContractor extends TileEntityBase implements IPacketRec
data.add(facing.ordinal());
data.add(suck);
data.add(energyStored);
data.add(this.dyeID);
return data;
}
@ -482,4 +490,13 @@ public class TileEntityEMContractor extends TileEntityBase implements IPacketRec
this.pathfinder.find(new Vector3(this));
}
}
/**
* @param itemDamage
*/
public void setDye(int dyeID)
{
this.dyeID = dyeID;
this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
}
}