From f3b36299e8a2b5ca288198f50680d2fcdb181647 Mon Sep 17 00:00:00 2001 From: Hubry Date: Sat, 21 Dec 2019 00:40:12 +0100 Subject: [PATCH] Fix redstring container destroying caps and popping off sparks sometimes --- .../tile/string/TileRedStringContainer.java | 32 ++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java index b1f72216c..3203ad712 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java @@ -33,6 +33,8 @@ public class TileRedStringContainer extends TileRedString { private static final LazyOptional EMPTY = LazyOptional.of(EmptyHandler::new); @Nullable private LazyOptional lastBoundInv = null; + @Nullable + private LazyOptional proxiedInv = null; public TileRedStringContainer() { this(TYPE); @@ -55,8 +57,21 @@ public class TileRedStringContainer extends TileRedString { public LazyOptional getCapability(@Nonnull Capability cap, Direction side) { if(cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { if(getTileAtBinding() != null) { - lastBoundInv = getTileAtBinding().getCapability(cap, side); - return lastBoundInv.cast(); + LazyOptional optional = getTileAtBinding().getCapability(cap, side); + if(!optional.isPresent()) { + invalidateLastCap(); + return EMPTY.cast(); + } + if(lastBoundInv == optional) { + return proxiedInv.cast(); + } + if(proxiedInv != null) { + proxiedInv.invalidate(); + } + lastBoundInv = optional; + proxiedInv = createProxyOptional(optional.cast()); + return proxiedInv.cast(); + } else { invalidateLastCap(); return EMPTY.cast(); @@ -66,10 +81,17 @@ public class TileRedStringContainer extends TileRedString { } private void invalidateLastCap() { - if(lastBoundInv != null) { - lastBoundInv.invalidate(); - lastBoundInv = null; + if(proxiedInv != null) { + proxiedInv.invalidate(); + proxiedInv = null; } + lastBoundInv = null; + } + + private LazyOptional createProxyOptional(LazyOptional original) { + LazyOptional proxy = LazyOptional.of(() -> original.orElse(EmptyHandler.INSTANCE)); + original.addListener(orig -> proxy.invalidate()); + return proxy; } @Override