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

Fixed errors due to changes in UE

Browse source
This commit is contained in:
Robert 2013-12-25 14:13:53 -05:00
parent f9de98798b
commit a9c31ce758
3 changed files with 2 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/com/builtbroken/assemblyline/multipart/PartBasicWire.java
View file

@ -25,7 +25,7 @@ public class PartBasicWire extends PartAdvanced implements IConductor
@Override
public long onReceiveEnergy(ForgeDirection from, long receive, boolean doReceive)
{
return this.getNetwork().produce(new Vector3(tile()).modifyPositionFromSide(from).getTileEntity(world()), from.getOpposite(), receive, doReceive);
return this.getNetwork().produce(this, from.getOpposite(), receive, doReceive);
}
@Override
@ -138,18 +138,6 @@ public class PartBasicWire extends PartAdvanced implements IConductor
return "assembly_line_basic_wire";
}
@Override
public long getSavedBuffer()
{
return this.saveBuffer;
}
@Override
public void setSaveBuffer(long energy)
{
this.saveBuffer = energy;
}
/** NBT Data */
@Override
public void load(NBTTagCompound nbt)

14
src/main/java/com/builtbroken/assemblyline/multipart/TraitConductor.java
View file

@ -162,18 +162,4 @@ public class TraitConductor extends TileMultipart implements IConductor
return capacitance;
}
@Override
public long getSavedBuffer()
{
// TODO Auto-generated method stub
return 0;
}
@Override
public void setSaveBuffer(long energy)
{
// TODO Auto-generated method stub
}
}

14
src/main/java/com/builtbroken/assemblyline/transmit/TileEntityWire.java
View file

@ -162,7 +162,7 @@ public class TileEntityWire extends TileEntityAdvanced implements IConductor, IS
{
if (this.canConnect(from) && this.getNetwork() != null)
{
return this.getNetwork().produce(VectorHelper.getTileEntityFromSide(this.worldObj, new Vector3(this), from.getOpposite()), from.getOpposite(), receive, doReceive);
return this.getNetwork().produce(this, from.getOpposite(), receive, doReceive);
}
return 0;
}
@ -209,18 +209,6 @@ public class TileEntityWire extends TileEntityAdvanced implements IConductor, IS
return 1000000;
}
@Override
public long getSavedBuffer()
{
return this.saveBuffer;
}
@Override
public void setSaveBuffer(long energy)
{
this.saveBuffer = energy;
}
/** NBT Data */
@Override
public void readFromNBT(NBTTagCompound nbt)