From 0a31d9c22fedcb6ad9be04935f4a8a3b963c09e8 Mon Sep 17 00:00:00 2001 From: Darkere Date: Sun, 13 Jun 2021 15:47:59 +0200 Subject: [PATCH] add default, fix conflict --- .../api/autocrafting/ICraftingPatternContainer.java | 8 ++++++-- .../apiimpl/network/node/CrafterNetworkNode.java | 10 ---------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternContainer.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternContainer.java index 4f0ef3738..bc1875d1a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternContainer.java @@ -153,10 +153,14 @@ public interface ICraftingPatternContainer { /** * @return whether the container is successfully connected to the inventory it wants to insert to */ - boolean hasConnectedInventory(); + default boolean hasConnectedInventory() { + return getConnectedInventory() != null; + } /** * @return whether the container is successfully connected to the fluid inventory it wants to insert to */ - boolean hasConnectedFluidInventory(); + default boolean hasConnectedFluidInventory() { + return getConnectedFluidInventory() != null; + } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java index 5487be55d..daa9662ed 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java @@ -552,14 +552,4 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC return true; } - - @Override - public boolean hasConnectedInventory() { - return getConnectedInventory() != null; - } - - @Override - public boolean hasConnectedFluidInventory() { - return getConnectedFluidInventory() != null; - } }