From 235fc2e81fc6c69150326f57d072eeb1e9fb50fb Mon Sep 17 00:00:00 2001 From: yueh Date: Tue, 7 Jul 2020 12:12:48 +0200 Subject: [PATCH] Removed superfluous IAEStack methods --- src/api/java/appeng/api/storage/data/IAEStack.java | 12 +----------- src/main/java/appeng/fluids/util/AEFluidStack.java | 10 ---------- src/main/java/appeng/util/item/AEItemStack.java | 10 ---------- 3 files changed, 1 insertion(+), 31 deletions(-) diff --git a/src/api/java/appeng/api/storage/data/IAEStack.java b/src/api/java/appeng/api/storage/data/IAEStack.java index 345405e2a..476a3d8b0 100644 --- a/src/api/java/appeng/api/storage/data/IAEStack.java +++ b/src/api/java/appeng/api/storage/data/IAEStack.java @@ -179,17 +179,7 @@ public interface IAEStack> { T empty(); /** - * @return true if the stack is a {@link IAEItemStack} - */ - boolean isItem(); - - /** - * @return true if the stack is a {@link IAEFluidStack} - */ - boolean isFluid(); - - /** - * @return ITEM or FLUID + * @return The {@link IStorageChannel} backing this stack. */ IStorageChannel getChannel(); diff --git a/src/main/java/appeng/fluids/util/AEFluidStack.java b/src/main/java/appeng/fluids/util/AEFluidStack.java index 9569c550d..00433bd84 100644 --- a/src/main/java/appeng/fluids/util/AEFluidStack.java +++ b/src/main/java/appeng/fluids/util/AEFluidStack.java @@ -152,16 +152,6 @@ public final class AEFluidStack extends AEStack implements IAEFlu return dup; } - @Override - public boolean isItem() { - return false; - } - - @Override - public boolean isFluid() { - return true; - } - @Override public IStorageChannel getChannel() { return AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class); diff --git a/src/main/java/appeng/util/item/AEItemStack.java b/src/main/java/appeng/util/item/AEItemStack.java index 3bcd1d7e1..369c66248 100644 --- a/src/main/java/appeng/util/item/AEItemStack.java +++ b/src/main/java/appeng/util/item/AEItemStack.java @@ -152,16 +152,6 @@ public final class AEItemStack extends AEStack implements IAEItemS return new AEItemStack(this); } - @Override - public boolean isItem() { - return true; - } - - @Override - public boolean isFluid() { - return false; - } - @Override public IStorageChannel getChannel() { return AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class);