Made build not include Calclavia Core anymore
This commit is contained in:
parent
2d14ce5e07
commit
0de0c7b385
5 changed files with 8 additions and 24 deletions
|
@ -65,10 +65,7 @@
|
|||
|
||||
<copy todir="JarContents">
|
||||
<fileset dir="${dir.mcp}/reobf/minecraft">
|
||||
<exclude name=".git/**"/>
|
||||
<exclude name="codechicken/**"/>
|
||||
<exclude name="universalelectricity/compatibility/**"/>
|
||||
<exclude name="universalelectricity/core/**"/>
|
||||
<include name="resonantinduction/**"/>
|
||||
</fileset>
|
||||
|
||||
<fileset dir="${dir.development}resources">
|
||||
|
|
|
@ -18,7 +18,7 @@ import universalelectricity.api.energy.IEnergyInterface;
|
|||
import universalelectricity.api.vector.Vector3;
|
||||
import calclavia.lib.network.IPacketReceiver;
|
||||
import calclavia.lib.network.IPacketSender;
|
||||
import calclavia.lib.tile.TileAdvanced;
|
||||
import calclavia.lib.prefab.tile.TileAdvanced;
|
||||
|
||||
import com.google.common.io.ByteArrayDataInput;
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ import resonantinduction.tesla.TileTesla;
|
|||
import universalelectricity.api.vector.Vector3;
|
||||
import calclavia.lib.network.IPacketReceiver;
|
||||
import calclavia.lib.network.IPacketSender;
|
||||
import calclavia.lib.tile.TileAdvanced;
|
||||
import calclavia.lib.prefab.tile.TileAdvanced;
|
||||
import calclavia.lib.utility.InventoryUtility;
|
||||
|
||||
import com.google.common.io.ByteArrayDataInput;
|
||||
|
|
|
@ -28,7 +28,7 @@ import universalelectricity.api.vector.Vector3;
|
|||
import calclavia.lib.network.IPacketReceiver;
|
||||
import calclavia.lib.network.IPacketSender;
|
||||
import calclavia.lib.prefab.CustomDamageSource;
|
||||
import calclavia.lib.tile.TileEntityElectrical;
|
||||
import calclavia.lib.prefab.tile.TileEntityElectrical;
|
||||
|
||||
import com.google.common.io.ByteArrayDataInput;
|
||||
|
||||
|
|
|
@ -24,15 +24,14 @@ public abstract class PartConductor extends PartAdvanced implements IConductor
|
|||
|
||||
protected Object[] connections = new Object[6];
|
||||
|
||||
private long savedBuffer;
|
||||
|
||||
/**
|
||||
* Universal Electricity conductor functions.
|
||||
*/
|
||||
@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);
|
||||
// new Vector3(tile()).modifyPositionFromSide(from).getTileEntity(world())
|
||||
return this.getNetwork().produce(this, from.getOpposite(), receive, doReceive);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -173,29 +172,17 @@ public abstract class PartConductor extends PartAdvanced implements IConductor
|
|||
super.preRemove();
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getSavedBuffer()
|
||||
{
|
||||
return this.savedBuffer;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSaveBuffer(long energy)
|
||||
{
|
||||
this.savedBuffer = energy;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void save(NBTTagCompound nbt)
|
||||
{
|
||||
super.save(nbt);
|
||||
nbt.setLong("savedBuffer", this.savedBuffer);
|
||||
nbt.setLong("savedBuffer", this.getNetwork().getBufferOf(this));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void load(NBTTagCompound nbt)
|
||||
{
|
||||
super.load(nbt);
|
||||
this.savedBuffer = nbt.getLong("savedBuffer");
|
||||
this.getNetwork().setBufferFor(nbt.getLong("savedBuffer"));
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue