From ee7067016d89a2f9da68eeb574d63e7adf14927e Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sat, 6 Dec 2014 21:19:23 +0800 Subject: [PATCH] #1347 Capacitor Bank energy duplication bug. --- ReleaseNotes.txt | 1 + .../machine/capbank/BlockItemCapBank.java | 6 ++++++ .../machine/power/BlockItemCapacitorBank.java | 16 +++++++++++----- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index afa6bb68..63a94a0f 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -18,6 +18,7 @@ Bugs - #1351 Travel Anchor: Item needs to be added before text is displayed - #1348 Item conduits not connecting to tesseracts in receive only mode - #1357 Power Conduits replaced by growing tree's +- #1347 Capacitor Bank energy duplication bug. ------------------------------------------------------ Version 2.2.2 diff --git a/src/main/java/crazypants/enderio/machine/capbank/BlockItemCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/BlockItemCapBank.java index 4aa4ef68..89cc36ad 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/BlockItemCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/BlockItemCapBank.java @@ -54,6 +54,9 @@ public class BlockItemCapBank extends ItemBlock implements IEnergyContainerItem @Override public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { + if(container.stackSize > 1) { + return 0; + } CapBankType type = CapBankType.getTypeFromMeta(container.getItemDamage()); int energy = getEnergyStored(container); int maxInput = type.getMaxIO(); @@ -69,6 +72,9 @@ public class BlockItemCapBank extends ItemBlock implements IEnergyContainerItem @Override public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { + if(container.stackSize > 1) { + return 0; + } CapBankType type = CapBankType.getTypeFromMeta(container.getItemDamage()); int energy = getEnergyStored(container); int maxOutput = type.getMaxIO(); diff --git a/src/main/java/crazypants/enderio/machine/power/BlockItemCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/BlockItemCapacitorBank.java index 981ed93a..e579a5cc 100644 --- a/src/main/java/crazypants/enderio/machine/power/BlockItemCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/BlockItemCapacitorBank.java @@ -68,16 +68,19 @@ public class BlockItemCapacitorBank extends ItemBlock implements IEnergyContaine @Override public double getDurabilityForDisplay(ItemStack itemStack) { - double stored = this.getMaxEnergyStored(itemStack) - this.getEnergyStored(itemStack) + 1; - double max = this.getMaxEnergyStored(itemStack) + 1; + double stored = getMaxEnergyStored(itemStack) - getEnergyStored(itemStack) + 1; + double max = getMaxEnergyStored(itemStack) + 1; return stored / max; } @Override public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - int energy = this.getEnergyStored(container); + if(container.stackSize > 1) { + return 0; + } + int energy = getEnergyStored(container); int maxInput = TileCapacitorBank.BASE_CAP.getMaxEnergyReceived(); - int energyReceived = Math.min(this.getMaxEnergyStored(container) - energy, Math.min(maxReceive, maxInput)); + int energyReceived = Math.min(getMaxEnergyStored(container) - energy, Math.min(maxReceive, maxInput)); if(!simulate && container.getItemDamage() != 1) { energy += energyReceived; @@ -88,7 +91,10 @@ public class BlockItemCapacitorBank extends ItemBlock implements IEnergyContaine @Override public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - int energy = this.getEnergyStored(container); + if(container.stackSize > 1) { + return 0; + } + int energy = getEnergyStored(container); int maxOutput = TileCapacitorBank.BASE_CAP.getMaxEnergyExtracted(); int energyExtracted = Math.min(energy, Math.min(maxExtract, maxOutput));