From 203522316ce2886101f9c0d6cc3d0c24b2efa6eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salom=C3=A3o?= Date: Sun, 25 Oct 2020 10:59:02 -0300 Subject: [PATCH] more tweaks testing --- .../java/appeng/helpers/DualityInterface.java | 11 +++++----- .../parts/automation/PartExportBus.java | 21 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index 69601ad28..0fd6f9b9d 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -112,7 +112,7 @@ import appeng.util.item.AEItemStack; public class DualityInterface implements IGridTickable, IStorageMonitorable, IInventoryDestination, IAEAppEngInventory, IConfigManagerHost, ICraftingProvider, IUpgradeableHost { - private int failedCraftTriesSlot[] = {0,0,0,0,0,0,0,0,0}; + private int[] failedCraftTriesSlot = {0,0,0,0,0,0,0,0,0}; public static final int NUMBER_OF_STORAGE_SLOTS = 9; public static final int NUMBER_OF_CONFIG_SLOTS = 9; @@ -765,16 +765,17 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn { if( this.getInstalledUpgrades( Upgrades.CRAFTING ) > 0 && itemStack != null ) { - if (this.failedCraftTriesSlot[x] <= 0) { - + if (this.failedCraftTriesSlot[x] <= 0) + { boolean crafted = this.craftingTracker.handleCrafting( x, itemStack.getStackSize(), itemStack, d, this.iHost.getTileEntity().getWorld(), this.gridProxy.getGrid(), this.gridProxy.getCrafting(), this.mySource ); if (crafted) this.failedCraftTriesSlot[x] = 0; - else this.failedCraftTriesSlot[x] += 5; + else{ + this.failedCraftTriesSlot[x] += 4; + } } this.failedCraftTriesSlot[x] -= 1; - } } catch( final GridAccessException e ) diff --git a/src/main/java/appeng/parts/automation/PartExportBus.java b/src/main/java/appeng/parts/automation/PartExportBus.java index 370828528..48cc81501 100644 --- a/src/main/java/appeng/parts/automation/PartExportBus.java +++ b/src/main/java/appeng/parts/automation/PartExportBus.java @@ -150,19 +150,18 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest final IAEItemStack ais = this.getConfig().getAEStackInSlot( slotToExport ); - if( ais == null || this.itemToSend <= 0 || this.craftOnly() ) { - if (this.isCraftingEnabled()) - { - if (this.failedCraftTriesSlot[x] <= 0) { + if( ais == null || this.itemToSend <= 0 ) continue; - this.didSomething = this.craftingTracker.handleCrafting(slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(), - this.getProxy().getGrid(), cg, this.mySrc) || this.didSomething; + if ( this.craftOnly() ) { + if (this.failedCraftTriesSlot[x] <= 0) { - if (this.didSomething) this.failedCraftTriesSlot[x] = 0; - else this.failedCraftTriesSlot[x] += 5; - } - this.failedCraftTriesSlot[x] -= 1; + this.didSomething = this.craftingTracker.handleCrafting(slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(), + this.getProxy().getGrid(), cg, this.mySrc) || this.didSomething; + + if (this.didSomething) this.failedCraftTriesSlot[x] = 0; + else this.failedCraftTriesSlot[x] += 4; } + this.failedCraftTriesSlot[x] -= 1; continue; } @@ -192,7 +191,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest this.getProxy().getGrid(), cg, this.mySrc) || this.didSomething; if (this.didSomething) this.failedCraftTriesSlot[x] = 0; - else this.failedCraftTriesSlot[x] += 5; + else this.failedCraftTriesSlot[x] += 4; } this.failedCraftTriesSlot[x] -= 1; }