diff --git a/src/main/java/appeng/me/cache/helpers/TunnelCollection.java b/src/main/java/appeng/me/cache/helpers/TunnelCollection.java index 7763eee28..9d6220ca4 100644 --- a/src/main/java/appeng/me/cache/helpers/TunnelCollection.java +++ b/src/main/java/appeng/me/cache/helpers/TunnelCollection.java @@ -67,4 +67,10 @@ public class TunnelCollection implements Iterable { return this.clz; } + + public int size() + { + return this.tunnelSources == null ? 0 : this.tunnelSources.size(); + } + } diff --git a/src/main/java/appeng/parts/p2p/PartP2PFEPower.java b/src/main/java/appeng/parts/p2p/PartP2PFEPower.java index af6ac9e6a..1f094050c 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PFEPower.java +++ b/src/main/java/appeng/parts/p2p/PartP2PFEPower.java @@ -35,7 +35,6 @@ import appeng.api.parts.IPartModel; import appeng.capabilities.Capabilities; import appeng.items.parts.PartModels; import appeng.me.GridAccessException; -import appeng.util.Platform; /** @@ -44,11 +43,17 @@ import appeng.util.Platform; public class PartP2PFEPower extends PartP2PTunnel implements IEnergyStorage { private static final P2PModels MODELS = new P2PModels( "part/p2p/p2p_tunnel_fe" ); + private static final IEnergyStorage NULL_ENERGY_STORAGE = new NullEnergyStorage(); private boolean cachedTarget = false; private IEnergyStorage outputTarget; + public PartP2PFEPower( ItemStack is ) + { + super( is ); + } + @PartModels public static List getModels() { @@ -61,11 +66,6 @@ public class PartP2PFEPower extends PartP2PTunnel implements IEn return MODELS.getModel( this.isPowered(), this.isActive() ); } - public PartP2PFEPower( ItemStack is ) - { - super( is ); - } - @Override public void onTunnelNetworkChange() { @@ -94,34 +94,24 @@ public class PartP2PFEPower extends PartP2PTunnel implements IEn try { - for( PartP2PFEPower t : this.getOutputs() ) - { - if( Platform.getRandomInt() % 2 > 0 ) - { - int receiver = t.getOutput().receiveEnergy( maxReceive, simulate ); - maxReceive -= receiver; - total += receiver; + final int outputTunnels = this.getOutputs().size(); - if( maxReceive <= 0 ) - { - break; - } - } + if( outputTunnels == 0 ) + { + return 0; } - if( maxReceive > 0 ) - { - for( PartP2PFEPower t : this.getOutputs() ) - { - int receiver = t.getOutput().receiveEnergy( maxReceive, simulate ); - maxReceive -= receiver; - total += receiver; + final int amountPerOutput = maxReceive / outputTunnels; + int overflow = maxReceive % amountPerOutput; - if( maxReceive <= 0 ) - { - break; - } - } + for( PartP2PFEPower target : this.getOutputs() ) + { + final IEnergyStorage output = target.getOutput(); + final int toSend = amountPerOutput + overflow; + final int received = output.receiveEnergy( toSend, simulate ); + + overflow = toSend - received; + total += received; } this.queueTunnelDrain( PowerUnits.RF, total ); @@ -148,22 +138,29 @@ public class PartP2PFEPower extends PartP2PTunnel implements IEn { if( !this.cachedTarget ) { - TileEntity self = this.getTile(); - TileEntity te = self.getWorld().getTileEntity( new BlockPos( self.getPos().getX() + this.getSide().xOffset, self.getPos() + final TileEntity self = this.getTile(); + final TileEntity te = self.getWorld().getTileEntity( new BlockPos( self.getPos().getX() + this.getSide().xOffset, self.getPos() .getY() + this.getSide().yOffset, self.getPos().getZ() + this.getSide().zOffset ) ); - this.outputTarget = te.hasCapability( Capabilities.FORGE_ENERGY, this.getSide().getOpposite().getFacing() ) ? te - .getCapability( Capabilities.FORGE_ENERGY, this.getSide().getOpposite().getFacing() ) : null; + + if( te != null && te.hasCapability( Capabilities.FORGE_ENERGY, this.getSide().getOpposite().getFacing() ) ) + { + this.outputTarget = te.getCapability( Capabilities.FORGE_ENERGY, this.getSide().getOpposite().getFacing() ); + } + else + { + this.outputTarget = null; + } + this.cachedTarget = true; } - if( this.outputTarget == null || !this.outputTarget.canReceive() ) + if( this.outputTarget != null && this.outputTarget.canReceive() ) { - return null; + return this.outputTarget; } - - return this.outputTarget; } - return null; + + return NULL_ENERGY_STORAGE; } @Override @@ -250,4 +247,45 @@ public class PartP2PFEPower extends PartP2PTunnel implements IEn return super.getCapability( capability ); } + + private static class NullEnergyStorage implements IEnergyStorage + { + + @Override + public int receiveEnergy( int maxReceive, boolean simulate ) + { + return 0; + } + + @Override + public int extractEnergy( int maxExtract, boolean simulate ) + { + return 0; + } + + @Override + public int getEnergyStored() + { + return 0; + } + + @Override + public int getMaxEnergyStored() + { + return 0; + } + + @Override + public boolean canExtract() + { + return false; + } + + @Override + public boolean canReceive() + { + return true; + } + + } } diff --git a/src/main/java/appeng/parts/p2p/PartP2PRFPower.java b/src/main/java/appeng/parts/p2p/PartP2PRFPower.java index 73a0967d6..9b8f39791 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PRFPower.java +++ b/src/main/java/appeng/parts/p2p/PartP2PRFPower.java @@ -35,13 +35,13 @@ import appeng.coremod.annotations.Integration.InterfaceList; import appeng.integration.IntegrationType; import appeng.items.parts.PartModels; import appeng.me.GridAccessException; -import appeng.util.Platform; @InterfaceList( value = { @Interface( iface = "cofh.redstoneflux.api.IEnergyReceiver", iname = IntegrationType.RF ) } ) public final class PartP2PRFPower extends PartP2PTunnel implements IEnergyReceiver { private static final P2PModels MODELS = new P2PModels( "part/p2p/p2p_tunnel_rf" ); + private static final IEnergyReceiver NULL_ENERGY_RECEIVER = new NullEnergyReceiver(); private boolean cachedTarget = false; @@ -92,34 +92,24 @@ public final class PartP2PRFPower extends PartP2PTunnel implemen try { - for( PartP2PRFPower t : this.getOutputs() ) - { - if( Platform.getRandomInt() % 2 > 0 ) - { - int receiver = t.getOutput().receiveEnergy( t.getSide().getFacing().getOpposite(), maxReceive, simulate ); - maxReceive -= receiver; - total += receiver; + final int outputTunnels = this.getOutputs().size(); - if( maxReceive <= 0 ) - { - break; - } - } + if( outputTunnels == 0 ) + { + return 0; } - if( maxReceive > 0 ) - { - for( PartP2PRFPower t : this.getOutputs() ) - { - int receiver = t.getOutput().receiveEnergy( t.getSide().getFacing().getOpposite(), maxReceive, simulate ); - maxReceive -= receiver; - total += receiver; + final int amountPerOutput = maxReceive / outputTunnels; + int overflow = maxReceive % amountPerOutput; - if( maxReceive <= 0 ) - { - break; - } - } + for( PartP2PRFPower target : this.getOutputs() ) + { + final IEnergyReceiver output = target.getOutput(); + final int toSend = amountPerOutput + overflow; + final int received = output.receiveEnergy( target.getSide().getFacing().getOpposite(), toSend, simulate ); + + overflow = toSend - received; + total += received; } this.queueTunnelDrain( PowerUnits.RF, total ); @@ -140,21 +130,21 @@ public final class PartP2PRFPower extends PartP2PTunnel implemen { if( !this.cachedTarget ) { - TileEntity self = this.getTile(); - TileEntity te = self.getWorld().getTileEntity( new BlockPos( self.getPos().getX() + this.getSide().xOffset, self.getPos() + final TileEntity self = this.getTile(); + final TileEntity te = self.getWorld().getTileEntity( new BlockPos( self.getPos().getX() + this.getSide().xOffset, self.getPos() .getY() + this.getSide().yOffset, self.getPos().getZ() + this.getSide().zOffset ) ); + this.outputTarget = te instanceof IEnergyReceiver ? (IEnergyReceiver) te : null; this.cachedTarget = true; } - if( this.outputTarget == null || !this.outputTarget.canConnectEnergy( this.getSide().getOpposite().getFacing() ) ) + if( this.outputTarget != null && this.outputTarget.canConnectEnergy( this.getSide().getOpposite().getFacing() ) ) { - return null; + return this.outputTarget; } - - return this.outputTarget; } - return null; + + return NULL_ENERGY_RECEIVER; } @Override @@ -212,4 +202,34 @@ public final class PartP2PRFPower extends PartP2PTunnel implemen { return true; } + + private static class NullEnergyReceiver implements IEnergyReceiver + { + + @Override + public int getEnergyStored( EnumFacing from ) + { + return 0; + } + + @Override + public int getMaxEnergyStored( EnumFacing from ) + { + return 0; + } + + @Override + public boolean canConnectEnergy( EnumFacing from ) + { + return true; + } + + @Override + public int receiveEnergy( EnumFacing from, int maxReceive, boolean simulate ) + { + return 0; + } + + } + }