tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Merge pull request #947 from yueh/fix-943

Browse source 
Fixes #943 readded callable for simultaneous block breaking
This commit is contained in:
yueh 2015-02-27 11:06:59 +01:00
commit 27b692823c
1 changed files with 42 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/main/java/appeng/parts/automation/PartAnnihilationPlane.java
View file

@ -19,6 +19,8 @@
package appeng.parts.automation; package appeng.parts.automation;
import java.util.concurrent.Callable;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import net.minecraft.block.Block; import net.minecraft.block.Block;
@ -57,6 +59,7 @@ import appeng.api.storage.data.IAEItemStack;
import appeng.client.texture.CableBusTextures; import appeng.client.texture.CableBusTextures;
import appeng.core.settings.TickRates; import appeng.core.settings.TickRates;
import appeng.core.sync.packets.PacketTransitionEffect; import appeng.core.sync.packets.PacketTransitionEffect;
import appeng.hooks.TickHandler;
import appeng.me.GridAccessException; import appeng.me.GridAccessException;
import appeng.parts.PartBasicState; import appeng.parts.PartBasicState;
import appeng.server.ServerHelper; import appeng.server.ServerHelper;
@ -64,17 +67,25 @@ import appeng.util.Platform;
import appeng.util.item.AEItemStack; import appeng.util.item.AEItemStack;
public class PartAnnihilationPlane extends PartBasicState implements IGridTickable public class PartAnnihilationPlane extends PartBasicState implements IGridTickable, Callable<TickRateModulation>
{ {
private boolean isAccepting = true; private boolean isAccepting = true;
private final BaseActionSource mySrc = new MachineSource( this ); private final BaseActionSource mySrc = new MachineSource( this );
private boolean breaking = false;
public PartAnnihilationPlane( ItemStack is ) public PartAnnihilationPlane( ItemStack is )
{ {
super( PartAnnihilationPlane.class, is ); super( PartAnnihilationPlane.class, is );
} }
@Override
public TickRateModulation call() throws Exception
{
this.breaking = false;
return this.breakblock( true );
}
@Override @Override
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
public void renderInventory( IPartRenderHelper rh, RenderBlocks renderer ) public void renderInventory( IPartRenderHelper rh, RenderBlocks renderer )
@ -233,7 +244,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
this.getHost().markForUpdate(); this.getHost().markForUpdate();
} }
public TickRateModulation breakblock() public TickRateModulation breakblock( boolean modulate )
{ {
if ( this.isAccepting() && this.proxy.isActive() ) if ( this.isAccepting() && this.proxy.isActive() )
{ {
@ -273,29 +284,34 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
if ( hasPower && canStore ) if ( hasPower && canStore )
{ {
w.setBlock( x, y, z, Platform.AIR, 0, 3 ); if ( modulate )
energy.extractAEPower( total, Actionable.MODULATE, PowerMultiplier.CONFIG );
final AxisAlignedBB box = AxisAlignedBB.getBoundingBox( x - 0.2, y - 0.2, z - 0.2, x + 1.2, y + 1.2, z + 1.2 );
for ( final Object ei : w.getEntitiesWithinAABB( EntityItem.class, box ) )
{ {
if ( ei instanceof EntityItem ) w.setBlock( x, y, z, Platform.AIR, 0, 3 );
{ energy.extractAEPower( total, Actionable.MODULATE, PowerMultiplier.CONFIG );
final EntityItem entityItem = ( EntityItem ) ei;
this.storeEntityItem( entityItem );
}
}
for ( final ItemStack snaggedItem : out ) final AxisAlignedBB box = AxisAlignedBB.getBoundingBox( x - 0.2, y - 0.2, z - 0.2, x + 1.2, y + 1.2, z + 1.2 );
for ( final Object ei : w.getEntitiesWithinAABB( EntityItem.class, box ) )
{
if ( ei instanceof EntityItem )
{
final EntityItem entityItem = ( EntityItem ) ei;
this.storeEntityItem( entityItem );
}
}
for ( final ItemStack snaggedItem : out )
{
this.storeItemStack( snaggedItem );
}
ServerHelper.proxy.sendToAllNearExcept( null, x, y, z, 64, w, new PacketTransitionEffect( x, y, z, this.side, true ) );
}
else
{ {
if ( this.storeItemStack( snaggedItem ) ) this.breaking = true;
{ TickHandler.INSTANCE.addCallable( this.tile.getWorldObj(), this );
ServerHelper.proxy.sendToAllNearExcept( null, x, y, z, 64, w, new PacketTransitionEffect( x, y, z, this.side, true ) );
}
} }
return TickRateModulation.URGENT; return TickRateModulation.URGENT;
} }
} }
} }
@ -397,8 +413,13 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
@Override @Override
public TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall ) public TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall )
{ {
if ( this.breaking )
{
return TickRateModulation.URGENT;
}
this.isAccepting = true; this.isAccepting = true;
return this.breakblock(); return this.breakblock( false );
} }
/** /**