diff --git a/src/main/java/appeng/crafting/CraftingJob.java b/src/main/java/appeng/crafting/CraftingJob.java index b4e746efd..a8b20d11b 100644 --- a/src/main/java/appeng/crafting/CraftingJob.java +++ b/src/main/java/appeng/crafting/CraftingJob.java @@ -384,7 +384,7 @@ public class CraftingJob implements Runnable, ICraftingJob public void addIncompletablePattern( ICraftingPatternDetails details, IAEItemStack stack ) { - ( (CraftingGridCache) cc ).getPatternDebtManager().put( details, stack ); + ( (CraftingGridCache) cc ).getPatternStatusManager().put( details, stack ); } private static class TwoIntegers diff --git a/src/main/java/appeng/crafting/CraftingTreeProcess.java b/src/main/java/appeng/crafting/CraftingTreeProcess.java index f09921647..d85887ee2 100644 --- a/src/main/java/appeng/crafting/CraftingTreeProcess.java +++ b/src/main/java/appeng/crafting/CraftingTreeProcess.java @@ -65,7 +65,7 @@ public class CraftingTreeProcess this.depth = depth; final World world = job.getWorld(); - if( !( (CraftingGridCache) cc ).getPatternDebtManager().containsIncompletablePattern( details ) && details.isCraftable() ) + if( !( (CraftingGridCache) cc ).getPatternStatusManager().containsIncompletablePattern( details ) && details.isCraftable() ) { final IAEItemStack[] list = details.getInputs(); diff --git a/src/main/java/appeng/helpers/MultiCraftingTracker.java b/src/main/java/appeng/helpers/MultiCraftingTracker.java index 9b04922ea..43b64690a 100644 --- a/src/main/java/appeng/helpers/MultiCraftingTracker.java +++ b/src/main/java/appeng/helpers/MultiCraftingTracker.java @@ -133,10 +133,10 @@ public class MultiCraftingTracker CraftingGridCache cgc = (CraftingGridCache) cg; - ImmutableCollection cl = cgc.getCraftingFor( aisC, null, 0, w ); + ImmutableCollection cl = cgc.getCraftingFor( aisC, null, x, w ); for( ICraftingPatternDetails craftingPatternDetails : cl ) { - if( cgc.getPatternDebtManager().containsIncompletablePattern( craftingPatternDetails ) ) + if( cgc.getPatternStatusManager().containsIncompletablePattern( craftingPatternDetails ) ) { return false; } diff --git a/src/main/java/appeng/me/cache/CraftingGridCache.java b/src/main/java/appeng/me/cache/CraftingGridCache.java index eaa91efa8..b218d7c0b 100644 --- a/src/main/java/appeng/me/cache/CraftingGridCache.java +++ b/src/main/java/appeng/me/cache/CraftingGridCache.java @@ -277,7 +277,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper this.craftingMethods.clear(); this.craftableItems.clear(); this.emitableItems.clear(); - ( (GridStorageCache) this.storageGrid ).clearDebts(); + ( (GridStorageCache) this.storageGrid ).clearPatternStatus(); // re-create list.. for( final ICraftingProvider provider : this.craftingProviders ) @@ -661,7 +661,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper return this.interestManager; } - public PatternStatusManager getPatternDebtManager() + public PatternStatusManager getPatternStatusManager() { return ( (GridStorageCache) this.storageGrid ).getPatternStatusManager(); } diff --git a/src/main/java/appeng/me/cache/GridStorageCache.java b/src/main/java/appeng/me/cache/GridStorageCache.java index 820df3c2b..21056be42 100644 --- a/src/main/java/appeng/me/cache/GridStorageCache.java +++ b/src/main/java/appeng/me/cache/GridStorageCache.java @@ -316,8 +316,9 @@ public class GridStorageCache implements IStorageGrid return this.patternStatusManager; } - public void clearDebts() + public void clearPatternStatus() { + System.out.println( "reseting pattern status due to pattern changes" ); this.patternDetails2IAEStackMultimap.clear(); this.iaeStack2PatternDetailsMultimap.clear(); }