add default, fix conflict

This commit is contained in:
Darkere
2021-06-13 15:47:59 +02:00
parent d837393c88
commit 0a31d9c22f
2 changed files with 6 additions and 12 deletions

View File

@@ -153,10 +153,14 @@ public interface ICraftingPatternContainer {
/** /**
* @return whether the container is successfully connected to the inventory it wants to insert to * @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 * @return whether the container is successfully connected to the fluid inventory it wants to insert to
*/ */
boolean hasConnectedFluidInventory(); default boolean hasConnectedFluidInventory() {
return getConnectedFluidInventory() != null;
}
} }

View File

@@ -552,14 +552,4 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC
return true; return true;
} }
@Override
public boolean hasConnectedInventory() {
return getConnectedInventory() != null;
}
@Override
public boolean hasConnectedFluidInventory() {
return getConnectedFluidInventory() != null;
}
} }