From 5e2eccadbd91171c01cdb209d1338bcfb7786b1c Mon Sep 17 00:00:00 2001 From: shedaniel Date: Thu, 2 Jan 2020 14:31:16 +0800 Subject: 3.3 Fix #58 Close #134 Close #158 Fix #227 --- .../java/me/shedaniel/rei/impl/AbstractEntryStack.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/impl/AbstractEntryStack.java') diff --git a/src/main/java/me/shedaniel/rei/impl/AbstractEntryStack.java b/src/main/java/me/shedaniel/rei/impl/AbstractEntryStack.java index fefe011c0..cdbbfdccd 100644 --- a/src/main/java/me/shedaniel/rei/impl/AbstractEntryStack.java +++ b/src/main/java/me/shedaniel/rei/impl/AbstractEntryStack.java @@ -15,29 +15,29 @@ import java.util.Map; @Deprecated public abstract class AbstractEntryStack extends DrawableHelper implements EntryStack { private Map settings = new HashMap<>(); - + @Override public EntryStack setting(Settings settings, T value) { this.settings.put(settings, value); return this; } - + @Override public EntryStack removeSetting(Settings settings) { this.settings.remove(settings); return this; } - + @Override public EntryStack clearSettings() { this.settings.clear(); return this; } - + protected Map getSettings() { return settings; } - + @Override public ObjectHolder getSetting(Settings settings) { Object o = this.settings.get(settings); @@ -45,7 +45,7 @@ public abstract class AbstractEntryStack extends DrawableHelper implements Entry return ObjectHolder.of(settings.getDefaultValue()); return ObjectHolder.of((T) o); } - + @Override public boolean equals(EntryStack stack, boolean ignoreTags, boolean ignoreAmount) { if (ignoreTags && ignoreAmount) @@ -56,7 +56,7 @@ public abstract class AbstractEntryStack extends DrawableHelper implements Entry return equalsIgnoreTags(stack); return equalsAll(stack); } - + @Override public boolean equals(Object obj) { if (!(obj instanceof EntryStack)) @@ -65,12 +65,12 @@ public abstract class AbstractEntryStack extends DrawableHelper implements Entry boolean checkTags = getSetting(Settings.CHECK_TAGS).value().get() || stack.getSetting(Settings.CHECK_TAGS).value().get(); return equals(stack, !checkTags, true); } - + @Override public int getZ() { return getBlitOffset(); } - + @Override public void setZ(int z) { setBlitOffset(z); -- cgit