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

More work on belts

Browse source
This commit is contained in:
Robert S 2014-03-29 11:04:44 -04:00
parent 8b92f8f6bc
commit e082a6a9b3
3 changed files with 23 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mechanical/src/main/scala/resonantinduction/mechanical/belt/BlockConveyorBelt.java
View file

@ -38,7 +38,7 @@ public class BlockConveyorBelt extends BlockTile
{
TileEntity tile = world.getBlockTileEntity(x, y, z);
if (tile instanceof TileConveyorBelt)
((TileConveyorBelt) tile).mechanicalNode.reconstruct();
((TileConveyorBelt) tile).node.reconstruct();
}
@Override
@ -251,7 +251,7 @@ public class BlockConveyorBelt extends BlockTile
slantOrdinal = 0;
}
tileEntity.setSlant(BeltType.values()[slantOrdinal]);
tileEntity.setBeltType(BeltType.values()[slantOrdinal]);
return true;
}

4
mechanical/src/main/scala/resonantinduction/mechanical/belt/RenderConveyorBelt.java
View file

@ -100,7 +100,7 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer implements ISi
bindTexture(name);
GL11.glRotatef(180, 0f, 1f, 0f);
GL11.glTranslatef(0f, -0.68f, 0f);
MODEL.render(0.0625f, (float) Math.toRadians(tileEntity.mechanicalNode.angle), false, false, false, false);
MODEL.render(0.0625f, (float) Math.toRadians(tileEntity.node.angle), false, false, false, false);
}
}
else
@ -122,7 +122,7 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer implements ISi
}
ResourceLocation name = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_PATH + "belt/frame" + frame + ".png");
bindTexture(name);
MODEL.render(0.0625F, (float) Math.toRadians(tileEntity.mechanicalNode.angle), false, false, false, true);
MODEL.render(0.0625F, (float) Math.toRadians(tileEntity.node.angle), false, false, false, true);
}

41
mechanical/src/main/scala/resonantinduction/mechanical/belt/TileConveyorBelt.java
View file

@ -56,12 +56,12 @@ public class TileConveyorBelt extends TileBase implements IBelt, IRotatable, INo
private boolean markRefresh = true;
public BeltNode mechanicalNode;
public BeltNode node;
public TileConveyorBelt()
{
super(Material.iron);
mechanicalNode = new BeltNode(this);
node = new BeltNode(this);
}
@Override
@ -80,15 +80,18 @@ public class TileConveyorBelt extends TileBase implements IBelt, IRotatable, INo
it.remove();
}
}
this.node.torque = 1;
this.node.angularVelocity = 1;
if (this.worldObj.isRemote)
/* DO ANIMATION AND EFFECTS */
if (this.worldObj.isRemote && (node.angularVelocity != 0))
{
if (this.ticks % 10 == 0 && this.worldObj.getBlockId(this.xCoord - 1, this.yCoord, this.zCoord) != Mechanical.blockConveyorBelt.blockID && this.worldObj.getBlockId(xCoord, yCoord, zCoord - 1) != Mechanical.blockConveyorBelt.blockID)
{
worldObj.playSound(this.xCoord, this.yCoord, this.zCoord, Reference.PREFIX + "conveyor", 0.5f, 0.5f + 0.15f * (float) getMoveVelocity(), true);
}
double beltPercentage = mechanicalNode.angle / (2 * Math.PI);
double beltPercentage = node.angle / (2 * Math.PI);
// Sync the animation. Slant belts are slower.
if (this.getBeltType() == BeltType.NORMAL || this.getBeltType() == BeltType.RAISED)
@ -121,8 +124,8 @@ public class TileConveyorBelt extends TileBase implements IBelt, IRotatable, INo
@Override
public <N extends INode> N getNode(Class<? super N> nodeType, ForgeDirection from)
{
if (nodeType.isAssignableFrom(mechanicalNode.getClass()))
return (N) mechanicalNode;
if (nodeType.isAssignableFrom(node.getClass()))
return (N) node;
return null;
}
@ -131,14 +134,14 @@ public class TileConveyorBelt extends TileBase implements IBelt, IRotatable, INo
{
if (this.getBeltType() != BeltType.NORMAL)
{
return ResonantInduction.PACKET_TILE.getPacket(this, PACKET_SLANT, this.getBeltType().ordinal());
return ResonantInduction.PACKET_TILE.getPacketWithID(PACKET_SLANT, this, this.getBeltType().ordinal());
}
return super.getDescriptionPacket();
}
public void sendRefreshPacket()
{
PacketDispatcher.sendPacketToAllPlayers(ResonantInduction.PACKET_TILE.getPacket(this, PACKET_REFRESH));
PacketDispatcher.sendPacketToAllPlayers(ResonantInduction.PACKET_TILE.getPacketWithID(PACKET_REFRESH, this, node.angle));
}
@Override
@ -153,25 +156,13 @@ public class TileConveyorBelt extends TileBase implements IBelt, IRotatable, INo
}
else if (id == PACKET_REFRESH)
{
mechanicalNode.reconstruct();
node.angle = data.readDouble();
return true;
}
}
return false;
}
public void setSlant(BeltType slantType)
{
if (slantType == null)
{
slantType = BeltType.NORMAL;
}
this.setBeltType(slantType);
mechanicalNode.reconstruct();
this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
}
@Override
public void setDirection(ForgeDirection facingDirection)
{
@ -217,7 +208,7 @@ public class TileConveyorBelt extends TileBase implements IBelt, IRotatable, INo
public double getMoveVelocity()
{
return Math.abs(mechanicalNode.getAngularVelocity());
return Math.abs(node.getAngularVelocity());
}
public int getAnimationFrame()
@ -232,6 +223,12 @@ public class TileConveyorBelt extends TileBase implements IBelt, IRotatable, INo
public void setBeltType(BeltType slantType)
{
if (slantType == null)
{
slantType = BeltType.NORMAL;
}
this.slantType = slantType;
node.reconstruct();
this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
}
}