Revert: Small improvements to the cables
This commit is contained in:
parent
2774407307
commit
0388f97873
1 changed files with 13 additions and 17 deletions
|
@ -35,23 +35,17 @@ import reborncore.common.RebornCoreConfig;
|
||||||
import techreborn.blocks.cable.BlockCable;
|
import techreborn.blocks.cable.BlockCable;
|
||||||
import techreborn.blocks.cable.EnumCableType;
|
import techreborn.blocks.cable.EnumCableType;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by modmuss50 on 19/05/2017.
|
* Created by modmuss50 on 19/05/2017.
|
||||||
*/
|
*/
|
||||||
public class TileCable extends TileEntity implements ITickable, IEnergyStorage {
|
public class TileCable extends TileEntity implements ITickable, IEnergyStorage {
|
||||||
public int power = 0;
|
public int power = 0;
|
||||||
|
|
||||||
List<TileCable> sentTo = new ArrayList<>();
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void update() {
|
public void update() {
|
||||||
if (world.isRemote) {
|
if (world.isRemote) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
sentTo.clear();
|
|
||||||
for (EnumFacing face : EnumFacing.VALUES) {
|
for (EnumFacing face : EnumFacing.VALUES) {
|
||||||
BlockPos offPos = getPos().offset(face);
|
BlockPos offPos = getPos().offset(face);
|
||||||
TileEntity tile = getWorld().getTileEntity(offPos);
|
TileEntity tile = getWorld().getTileEntity(offPos);
|
||||||
|
@ -59,23 +53,25 @@ public class TileCable extends TileEntity implements ITickable, IEnergyStorage {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (tile.hasCapability(CapabilityEnergy.ENERGY, face.getOpposite())) {
|
if (!(tile instanceof TileCable) && tile.hasCapability(CapabilityEnergy.ENERGY, face.getOpposite())) {
|
||||||
if(tile instanceof TileCable){
|
|
||||||
if (((TileCable) tile).sentTo.contains(this)){
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
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);
|
||||||
if (move != 0 && power >= move) {
|
if (move != 0) {
|
||||||
power -= move;
|
power -= move;
|
||||||
if(tile instanceof TileCable){
|
|
||||||
sentTo.add((TileCable) tile);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -115,7 +111,7 @@ public class TileCable extends TileEntity implements ITickable, IEnergyStorage {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getMaxEnergyStored() {
|
public int getMaxEnergyStored() {
|
||||||
return getCableType().transferRate;
|
return getCableType().transferRate * 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue