From 5bf5b14fa83d5d15249f6c3127c70308329e17b1 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 23 Dec 2021 13:12:54 +0100 Subject: [PATCH] fixed the aura recharge effect not fully charging a cache Closes #225 --- src/main/java/de/ellpeck/naturesaura/InternalHooks.java | 5 ++--- .../naturesaura/blocks/tiles/BlockEntityNatureAltar.java | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/ellpeck/naturesaura/InternalHooks.java b/src/main/java/de/ellpeck/naturesaura/InternalHooks.java index 0d82b1c7..606bc3d9 100644 --- a/src/main/java/de/ellpeck/naturesaura/InternalHooks.java +++ b/src/main/java/de/ellpeck/naturesaura/InternalHooks.java @@ -43,11 +43,10 @@ public class InternalHooks implements NaturesAuraAPI.IInternalHooks { if (!stack.isEmpty()) { var container = stack.getCapability(NaturesAuraAPI.capAuraContainer).orElse(null); if (extract) { - amount -= container.drainAura(amount, simulate); + return container.drainAura(amount, simulate) > 0; } else { - amount -= container.storeAura(amount, simulate); + return container.storeAura(amount, simulate) > 0; } - return amount <= 0; } return false; } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityNatureAltar.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityNatureAltar.java index cba1b03d..56ded84b 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityNatureAltar.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityNatureAltar.java @@ -48,10 +48,11 @@ public class BlockEntityNatureAltar extends BlockEntityImpl implements ITickable @Override protected boolean canExtract(ItemStack stack, int slot, int amount) { var cap = stack.getCapability(NaturesAuraAPI.capAuraContainer, null).orElse(null); - if (cap != null) + if (cap != null) { return cap.storeAura(1, true) <= 0; - else + } else { return BlockEntityNatureAltar.this.getRecipeForInput(stack) == null; + } } }; @OnlyIn(Dist.CLIENT)