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

Interfaces now slow down with failed crafting attempts.

Browse source 
Cleanup of unneeded tracking of failed attempts of MultiCraftingTracker.
Followup of #1905
This commit is contained in:
yueh 2015-12-26 22:02:20 +01:00
parent 04b1ca3485
commit dd1ae4a9b5
2 changed files with 2 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/appeng/helpers/MultiCraftingTracker.java
View file

@ -46,7 +46,6 @@ public class MultiCraftingTracker
private Future<ICraftingJob>[] jobs = null; private Future<ICraftingJob>[] jobs = null;
private ICraftingLink[] links = null; private ICraftingLink[] links = null;
private int failedCraftingAttempts = 0;
public MultiCraftingTracker( final ICraftingRequester o, final int size ) public MultiCraftingTracker( final ICraftingRequester o, final int size )
{ {
@ -54,11 +53,6 @@ public class MultiCraftingTracker
this.size = size; this.size = size;
} }
public int getFailedCraftingAttempts()
{
return this.failedCraftingAttempts;
}
public void readFromNBT( final NBTTagCompound extra ) public void readFromNBT( final NBTTagCompound extra )
{ {
for( int x = 0; x < this.size; x++ ) for( int x = 0; x < this.size; x++ )
@ -115,15 +109,10 @@ public class MultiCraftingTracker
if( link != null ) if( link != null )
{ {
this.failedCraftingAttempts = Math.max( 0, this.failedCraftingAttempts - 1 );
this.setLink( x, link ); this.setLink( x, link );
return true;
} }
else
{
this.failedCraftingAttempts = Math.min( 10, this.failedCraftingAttempts + 1 );
}
return true;
} }
} }
catch( final InterruptedException e ) catch( final InterruptedException e )

21
src/main/java/appeng/parts/automation/PartExportBus.java
View file

@ -176,13 +176,6 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
// :P // :P
} }
final int failedAttempts = this.craftingTracker.getFailedCraftingAttempts();
if( this.isCraftingEnabled() && failedAttempts > 0 )
{
return this.getFailedCraftingPenalty( failedAttempts );
}
return this.didSomething ? TickRateModulation.FASTER : TickRateModulation.SLOWER; return this.didSomething ? TickRateModulation.FASTER : TickRateModulation.SLOWER;
} }
@ -388,18 +381,4 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
this.nextSlot = ( this.nextSlot + x ) % this.availableSlots(); this.nextSlot = ( this.nextSlot + x ) % this.availableSlots();
} }
} }
private TickRateModulation getFailedCraftingPenalty( final int failedAttempts )
{
if( failedAttempts > 5 )
{
return TickRateModulation.SLOWER;
}
else if( failedAttempts > 1 )
{
return TickRateModulation.SAME;
}
return TickRateModulation.FASTER;
}
} }