From 9db46b9efc0ab187ccb758d8421dc4c4b4e7cedc Mon Sep 17 00:00:00 2001 From: Shadows_of_Fire Date: Sun, 12 Aug 2018 10:44:35 -0400 Subject: [PATCH] Closes #1159 --- .../mod/tile/TileEntityEmpowerer.java | 47 +++++++++++-------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java index d067463d6..83daf8c16 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java @@ -76,31 +76,40 @@ public class TileEntityEmpowerer extends TileEntityInventoryBase { if (recipe != null) { this.recipeForRenderIndex = ActuallyAdditionsAPI.EMPOWERER_RECIPES.indexOf(recipe); - this.processTime++; - boolean done = this.processTime >= recipe.getTime(); + boolean hasPower = true; for (TileEntityDisplayStand stand : stands) { - stand.storage.extractEnergyInternal(recipe.getEnergyPerStand() / recipe.getTime(), false); + if (stand.storage.getEnergyStored() < recipe.getEnergyPerStand() / recipe.getTime()) hasPower = false; + } + + if (hasPower) { + + this.processTime++; + boolean done = this.processTime >= recipe.getTime(); + + for (TileEntityDisplayStand stand : stands) { + stand.storage.extractEnergyInternal(recipe.getEnergyPerStand() / recipe.getTime(), false); + + if (done) { + stand.inv.getStackInSlot(0).shrink(1); + stand.markDirty(); + } + } + + if (this.processTime % 5 == 0 && this.world instanceof WorldServer) { + ((WorldServer) this.world).spawnParticle(EnumParticleTypes.FIREWORKS_SPARK, false, this.pos.getX() + 0.5, this.pos.getY() + 1.1, this.pos.getZ() + 0.5, 2, 0, 0, 0, 0.1D); + } if (done) { - stand.inv.getStackInSlot(0).shrink(1); - stand.markDirty(); + ((WorldServer) this.world).spawnParticle(EnumParticleTypes.END_ROD, false, this.pos.getX() + 0.5, this.pos.getY() + 1.1, this.pos.getZ() + 0.5, 100, 0, 0, 0, 0.25D); + + this.inv.setStackInSlot(0, recipe.getOutput().copy()); + this.markDirty(); + + this.processTime = 0; + this.recipeForRenderIndex = -1; } } - - if (this.processTime % 5 == 0 && this.world instanceof WorldServer) { - ((WorldServer) this.world).spawnParticle(EnumParticleTypes.FIREWORKS_SPARK, false, this.pos.getX() + 0.5, this.pos.getY() + 1.1, this.pos.getZ() + 0.5, 2, 0, 0, 0, 0.1D); - } - - if (done) { - ((WorldServer) this.world).spawnParticle(EnumParticleTypes.END_ROD, false, this.pos.getX() + 0.5, this.pos.getY() + 1.1, this.pos.getZ() + 0.5, 100, 0, 0, 0, 0.25D); - - this.inv.setStackInSlot(0, recipe.getOutput().copy()); - this.markDirty(); - - this.processTime = 0; - this.recipeForRenderIndex = -1; - } } else { this.processTime = 0; this.recipeForRenderIndex = -1;