fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature #3832: Made onRequestChange() less ambiguous (#3833)

Browse Source
This commit is contained in:
yueh
2018-12-23 22:41:52 +01:00
committed by GitHub
parent ed643787df
commit a847a01d8a
3 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/me/cache/CraftingGridCache.java
Vendored
+11 -5
View File
@@ -576,15 +576,21 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
@Override
public boolean isRequesting( final IAEItemStack what )
{
return this.requesting( what ) > 0;
}
@Override
public long requesting( IAEItemStack what )
{
long requested = 0;
for( final CraftingCPUCluster cluster : this.craftingCPUClusters )
{
if( cluster.isMaking( what ) )
{
return true;
}
final IAEItemStack stack = cluster.making( what );
requested += stack != null ? stack.getStackSize() : 0;
}
return false;
return requested;
}
public List<ICraftingMedium> getMediums( final ICraftingPatternDetails key )
src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
+7 -6
View File
@@ -28,7 +28,6 @@ import java.util.Map;
import java.util.Map.Entry;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
@@ -300,7 +299,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
this.updateElapsedTime( what );
this.markDirty();
this.postCraftingStatusChange( is );
this.postCraftingStatusChange( what.copy().setStackSize( -what.getStackSize() ) );
if( this.finalOutput.equals( what ) )
{
@@ -332,6 +331,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
what.decStackSize( is.getStackSize() );
is.setStackSize( 0 );
this.postCraftingStatusChange( insert.copy().setStackSize( -insert.getStackSize() ) );
if( this.finalOutput.equals( insert ) )
{
@@ -556,7 +556,9 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
this.myLastLink = null;
this.tasks.clear();
final ImmutableSet<IAEItemStack> items = ImmutableSet.copyOf( this.waitingFor );
// final ImmutableSet<IAEItemStack> items = ImmutableSet.copyOf( this.waitingFor );
final List<IAEItemStack> items = new ArrayList<>( this.waitingFor.size() );
this.waitingFor.forEach( stack -> items.add( stack.copy().setStackSize( -stack.getStackSize() ) ) );
this.waitingFor.resetStatus();
@@ -1304,10 +1306,9 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
return this.getCore().getWorld();
}
public boolean isMaking( final IAEItemStack what )
public IAEItemStack making( final IAEItemStack what )
{
final IAEItemStack wat = this.waitingFor.findPrecise( what );
return wat != null && wat.getStackSize() > 0;
return this.waitingFor.findPrecise( what );
}
public void breakCluster()