From b2d0af7a9fb0d16f14b294802f6718ac315d0de8 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Fri, 20 Dec 2019 17:31:30 +0800 Subject: 3.2.27 --- .../me/shedaniel/rei/impl/EmptyEntryStack.java | 41 ++++++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/impl/EmptyEntryStack.java') diff --git a/src/main/java/me/shedaniel/rei/impl/EmptyEntryStack.java b/src/main/java/me/shedaniel/rei/impl/EmptyEntryStack.java index 0242d9d1b..0d40b8e97 100644 --- a/src/main/java/me/shedaniel/rei/impl/EmptyEntryStack.java +++ b/src/main/java/me/shedaniel/rei/impl/EmptyEntryStack.java @@ -7,6 +7,7 @@ package me.shedaniel.rei.impl; import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.api.EntryStack; +import me.shedaniel.rei.api.ObjectHolder; import me.shedaniel.rei.gui.widget.QueuedTooltip; import net.minecraft.util.Identifier; @@ -14,10 +15,9 @@ import javax.annotation.Nullable; import java.util.Optional; @Deprecated -public class EmptyEntryStack extends AbstractEntryStack { +public class EmptyEntryStack implements EntryStack { - @Deprecated - public static final EntryStack EMPTY = new EmptyEntryStack(); + @Deprecated public static final EntryStack EMPTY = new EmptyEntryStack(); private EmptyEntryStack() { } @@ -57,6 +57,11 @@ public class EmptyEntryStack extends AbstractEntryStack { return null; } + @Override + public boolean equals(EntryStack stack, boolean ignoreTags, boolean ignoreAmount) { + return stack.getType() == getType(); + } + @Override public boolean equalsIgnoreTagsAndAmount(EntryStack stack) { return stack.getType() == getType(); @@ -77,6 +82,36 @@ public class EmptyEntryStack extends AbstractEntryStack { return stack.getType() == getType(); } + @Override + public int getZ() { + return 0; + } + + @Override + public void setZ(int z) { + + } + + @Override + public EntryStack setting(Settings settings, T value) { + return this; + } + + @Override + public EntryStack removeSetting(Settings settings) { + return this; + } + + @Override + public EntryStack clearSettings() { + return this; + } + + @Override + public ObjectHolder getSetting(Settings settings) { + return ObjectHolder.of(settings.getDefaultValue()); + } + @Override @Nullable public QueuedTooltip getTooltip(int mouseX, int mouseY) { -- cgit