From 03287f071ac524bdaece17152f92cfd3af098eda Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Mon, 11 Nov 2019 16:50:03 +0100 Subject: [PATCH] Fix alternatives button showing up when not allowed --- .../raoulvdberge/refinedstorage/screen/BaseScreen.java | 8 ++++---- .../refinedstorage/screen/FluidAmountScreen.java | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/BaseScreen.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/BaseScreen.java index d72d3d0bf..641015f30 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/BaseScreen.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/BaseScreen.java @@ -191,13 +191,13 @@ public abstract class BaseScreen extends ContainerScreen slot.slotNumber, slot.getStack(), slot.getSlotStackLimit(), - parent -> new AlternativesScreen( + ((FilterSlot) slot).isAlternativesAllowed() ? (parent -> new AlternativesScreen( parent, minecraft.player, new TranslationTextComponent("gui.refinedstorage.alternatives"), slot.getStack(), slot.getSlotIndex() - ) + )) : null )); } } @@ -220,13 +220,13 @@ public abstract class BaseScreen extends ContainerScreen slot.slotNumber, stack, ((FluidFilterSlot) slot).getFluidInventory().getMaxAmount(), - parent -> new AlternativesScreen( + ((FluidFilterSlot) slot).isAlternativesAllowed() ? (parent -> new AlternativesScreen( this, minecraft.player, new TranslationTextComponent("gui.refinedstorage.alternatives"), stack, slot.getSlotIndex() - ) + )) : null )); } } else { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/FluidAmountScreen.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/FluidAmountScreen.java index f3b11d8a3..cf674ec5e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/FluidAmountScreen.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/FluidAmountScreen.java @@ -14,7 +14,6 @@ import org.apache.commons.lang3.tuple.Pair; import javax.annotation.Nullable; import java.util.function.Function; -// TODO here too public class FluidAmountScreen extends AmountSpecifyingScreen { private int containerSlot; private FluidStack stack;