Merge pull request #2073 from yueh/fix-1905-followup
Interfaces now slow down with failed crafting attempts.
This commit is contained in:
commit
740324913e
2 changed files with 2 additions and 34 deletions
|
@ -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,17 +109,12 @@ 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 );
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
this.failedCraftingAttempts = Math.min( 10, this.failedCraftingAttempts + 1 );
|
|
||||||
}
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
catch( final InterruptedException e )
|
catch( final InterruptedException e )
|
||||||
{
|
{
|
||||||
// :P
|
// :P
|
||||||
|
|
|
@ -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;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue