Commit uncommitted power net code
This commit is contained in:
parent
d474870977
commit
b8a2d2d266
1 changed files with 16 additions and 15 deletions
|
@ -28,15 +28,8 @@ public class TileCable extends TileEntity implements ITickable, IEnergyStorage {
|
||||||
if (tile == null) {
|
if (tile == null) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (tile instanceof TileCable) {
|
|
||||||
TileCable cable = (TileCable) tile;
|
if (!(tile instanceof TileCable) && tile.hasCapability(CapabilityEnergy.ENERGY, face.getOpposite())) {
|
||||||
int averPower = (power + cable.power) / 2;
|
|
||||||
cable.power = averPower;
|
|
||||||
if (averPower % 2 != 0 && power != 0) {
|
|
||||||
averPower++;
|
|
||||||
}
|
|
||||||
power = averPower;
|
|
||||||
} else if (tile.hasCapability(CapabilityEnergy.ENERGY, face.getOpposite())) {
|
|
||||||
IEnergyStorage energy = tile.getCapability(CapabilityEnergy.ENERGY, face.getOpposite());
|
IEnergyStorage energy = tile.getCapability(CapabilityEnergy.ENERGY, face.getOpposite());
|
||||||
if (energy.canReceive()) {
|
if (energy.canReceive()) {
|
||||||
int move = energy.receiveEnergy(Math.min(getCableType().transferRate, power), false);
|
int move = energy.receiveEnergy(Math.min(getCableType().transferRate, power), false);
|
||||||
|
@ -45,11 +38,19 @@ public class TileCable extends TileEntity implements ITickable, IEnergyStorage {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (tile instanceof TileCable) {
|
||||||
|
TileCable cable = (TileCable) tile;
|
||||||
|
int averPower = (power + cable.power) / 2;
|
||||||
|
cable.power = averPower;
|
||||||
|
if (averPower % 2 != 0 && power != 0) {
|
||||||
|
averPower++;
|
||||||
|
}
|
||||||
|
power = averPower;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private EnumCableType getCableType() {
|
private EnumCableType getCableType() {
|
||||||
//Todo cache this
|
//Todo cache this
|
||||||
return world.getBlockState(pos).getValue(BlockCable.TYPE);
|
return world.getBlockState(pos).getValue(BlockCable.TYPE);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue