From 0de0c7b3853173b85f958deb3b57ca12154331ac Mon Sep 17 00:00:00 2001 From: Calclavia Date: Wed, 25 Dec 2013 23:47:16 +0800 Subject: [PATCH] Made build not include Calclavia Core anymore --- build.xml | 5 +---- .../battery/TileBattery.java | 2 +- .../levitator/TileEMLevitator.java | 2 +- src/resonantinduction/tesla/TileTesla.java | 2 +- .../wire/part/PartConductor.java | 21 ++++--------------- 5 files changed, 8 insertions(+), 24 deletions(-) diff --git a/build.xml b/build.xml index fbf7bc79..f1ecb987 100644 --- a/build.xml +++ b/build.xml @@ -65,10 +65,7 @@ - - - - + diff --git a/src/resonantinduction/battery/TileBattery.java b/src/resonantinduction/battery/TileBattery.java index aa495288..9f1761e2 100644 --- a/src/resonantinduction/battery/TileBattery.java +++ b/src/resonantinduction/battery/TileBattery.java @@ -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; diff --git a/src/resonantinduction/levitator/TileEMLevitator.java b/src/resonantinduction/levitator/TileEMLevitator.java index 76239faa..4bf915e2 100644 --- a/src/resonantinduction/levitator/TileEMLevitator.java +++ b/src/resonantinduction/levitator/TileEMLevitator.java @@ -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; diff --git a/src/resonantinduction/tesla/TileTesla.java b/src/resonantinduction/tesla/TileTesla.java index 346fb8d5..d907a527 100644 --- a/src/resonantinduction/tesla/TileTesla.java +++ b/src/resonantinduction/tesla/TileTesla.java @@ -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; diff --git a/src/resonantinduction/wire/part/PartConductor.java b/src/resonantinduction/wire/part/PartConductor.java index 7cdfdcb3..51777735 100644 --- a/src/resonantinduction/wire/part/PartConductor.java +++ b/src/resonantinduction/wire/part/PartConductor.java @@ -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")); } }