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

Made build not include Calclavia Core anymore

Browse source
This commit is contained in:
Calclavia 2013-12-25 23:47:16 +08:00
parent 2d14ce5e07
commit 0de0c7b385
5 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build.xml
View file

@ -65,10 +65,7 @@
<copy todir="JarContents"> <copy todir="JarContents">
<fileset dir="${dir.mcp}/reobf/minecraft"> <fileset dir="${dir.mcp}/reobf/minecraft">
<exclude name=".git/**"/> <include name="resonantinduction/**"/>
<exclude name="codechicken/**"/>
<exclude name="universalelectricity/compatibility/**"/>
<exclude name="universalelectricity/core/**"/>
</fileset> </fileset>
<fileset dir="${dir.development}resources"> <fileset dir="${dir.development}resources">

2
src/resonantinduction/battery/TileBattery.java
View file

@ -18,7 +18,7 @@ import universalelectricity.api.energy.IEnergyInterface;
import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.Vector3;
import calclavia.lib.network.IPacketReceiver; import calclavia.lib.network.IPacketReceiver;
import calclavia.lib.network.IPacketSender; import calclavia.lib.network.IPacketSender;
import calclavia.lib.tile.TileAdvanced; import calclavia.lib.prefab.tile.TileAdvanced;
import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataInput;

2
src/resonantinduction/levitator/TileEMLevitator.java
View file

@ -27,7 +27,7 @@ import resonantinduction.tesla.TileTesla;
import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.Vector3;
import calclavia.lib.network.IPacketReceiver; import calclavia.lib.network.IPacketReceiver;
import calclavia.lib.network.IPacketSender; import calclavia.lib.network.IPacketSender;
import calclavia.lib.tile.TileAdvanced; import calclavia.lib.prefab.tile.TileAdvanced;
import calclavia.lib.utility.InventoryUtility; import calclavia.lib.utility.InventoryUtility;
import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataInput;

2
src/resonantinduction/tesla/TileTesla.java
View file

@ -28,7 +28,7 @@ import universalelectricity.api.vector.Vector3;
import calclavia.lib.network.IPacketReceiver; import calclavia.lib.network.IPacketReceiver;
import calclavia.lib.network.IPacketSender; import calclavia.lib.network.IPacketSender;
import calclavia.lib.prefab.CustomDamageSource; import calclavia.lib.prefab.CustomDamageSource;
import calclavia.lib.tile.TileEntityElectrical; import calclavia.lib.prefab.tile.TileEntityElectrical;
import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataInput;

21
src/resonantinduction/wire/part/PartConductor.java
View file

@ -24,15 +24,14 @@ public abstract class PartConductor extends PartAdvanced implements IConductor
protected Object[] connections = new Object[6]; protected Object[] connections = new Object[6];
private long savedBuffer;
/** /**
* Universal Electricity conductor functions. * Universal Electricity conductor functions.
*/ */
@Override @Override
public long onReceiveEnergy(ForgeDirection from, long receive, boolean doReceive) 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 @Override
@ -173,29 +172,17 @@ public abstract class PartConductor extends PartAdvanced implements IConductor
super.preRemove(); super.preRemove();
} }
@Override
public long getSavedBuffer()
{
return this.savedBuffer;
}
@Override
public void setSaveBuffer(long energy)
{
this.savedBuffer = energy;
}
@Override @Override
public void save(NBTTagCompound nbt) public void save(NBTTagCompound nbt)
{ {
super.save(nbt); super.save(nbt);
nbt.setLong("savedBuffer", this.savedBuffer); nbt.setLong("savedBuffer", this.getNetwork().getBufferOf(this));
} }
@Override @Override
public void load(NBTTagCompound nbt) public void load(NBTTagCompound nbt)
{ {
super.load(nbt); super.load(nbt);
this.savedBuffer = nbt.getLong("savedBuffer"); this.getNetwork().setBufferFor(nbt.getLong("savedBuffer"));
} }
} }