From d6499c16b00be664fca72d71ced0e4527dcb596f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salom=C3=A3o?= Date: Wed, 28 Oct 2020 16:59:51 -0300 Subject: [PATCH] undo penalties --- .../java/appeng/helpers/DualityInterface.java | 20 ++++--------------- .../parts/automation/PartExportBus.java | 16 --------------- 2 files changed, 4 insertions(+), 32 deletions(-) diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index 0fd6f9b9d..262039ed2 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -112,8 +112,6 @@ 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}; - public static final int NUMBER_OF_STORAGE_SLOTS = 9; public static final int NUMBER_OF_CONFIG_SLOTS = 9; public static final int NUMBER_OF_PATTERN_SLOTS = 9; @@ -761,21 +759,11 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn private boolean handleCrafting( final int x, final InventoryAdaptor d, final IAEItemStack itemStack ) { - try - { - if( this.getInstalledUpgrades( Upgrades.CRAFTING ) > 0 && itemStack != null ) - { - 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 ); + try { + if (this.getInstalledUpgrades(Upgrades.CRAFTING) > 0 && itemStack != null) { + 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] += 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 48cc81501..37578ac99 100644 --- a/src/main/java/appeng/parts/automation/PartExportBus.java +++ b/src/main/java/appeng/parts/automation/PartExportBus.java @@ -70,8 +70,6 @@ import appeng.util.item.AEItemStack; public class PartExportBus extends PartSharedItemBus implements ICraftingRequester { - private final int[] failedCraftTriesSlot = {0,0,0,0,0,0,0,0,0}; - public static final ResourceLocation MODEL_BASE = new ResourceLocation( AppEng.MOD_ID, "part/export_bus_base" ); @PartModels @@ -153,15 +151,8 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest if( ais == null || this.itemToSend <= 0 ) continue; if ( this.craftOnly() ) { - if (this.failedCraftTriesSlot[x] <= 0) { - 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; } @@ -185,15 +176,8 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest if( this.itemToSend == before && this.isCraftingEnabled() ) { - if (this.failedCraftTriesSlot[x] <= 0) { - 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; } }