mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-20 12:19:55 +00:00
#1347 Capacitor Bank energy duplication bug.
This commit is contained in:
1 parent
896b527485
commit
ee7067016d
3 files changed
+18
-5
No files matched your search
@@ -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();
|
||||
|
||||
@@ -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));
|
||||
|
||||
|
||||
Reference in new issue
Block a user