diff options
| author | shedaniel <daniel@shedaniel.me> | 2020-01-09 12:40:17 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2020-01-09 12:40:17 +0800 |
| commit | af08708b9616f5b7e857b93f6848f73356cbe458 (patch) | |
| tree | 474bfb5eef31289ab0b3f89e22d2e33804eba7e2 /src/main/java/me/shedaniel/rei/impl/AbstractEntryStack.java | |
| parent | c7ec6b900f33620819abb5044409c30d26c31d8f (diff) | |
| download | RoughlyEnoughItems-af08708b9616f5b7e857b93f6848f73356cbe458.tar.gz RoughlyEnoughItems-af08708b9616f5b7e857b93f6848f73356cbe458.tar.bz2 RoughlyEnoughItems-af08708b9616f5b7e857b93f6848f73356cbe458.zip | |
Compact Tabs
Diffstat (limited to 'src/main/java/me/shedaniel/rei/impl/AbstractEntryStack.java')
| -rw-r--r-- | src/main/java/me/shedaniel/rei/impl/AbstractEntryStack.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main/java/me/shedaniel/rei/impl/AbstractEntryStack.java b/src/main/java/me/shedaniel/rei/impl/AbstractEntryStack.java index cdbbfdccd..1a1626042 100644 --- a/src/main/java/me/shedaniel/rei/impl/AbstractEntryStack.java +++ b/src/main/java/me/shedaniel/rei/impl/AbstractEntryStack.java @@ -6,7 +6,6 @@ package me.shedaniel.rei.impl; import me.shedaniel.rei.api.EntryStack; -import me.shedaniel.rei.api.ObjectHolder; import net.minecraft.client.gui.DrawableHelper; import java.util.HashMap; @@ -39,11 +38,11 @@ public abstract class AbstractEntryStack extends DrawableHelper implements Entry } @Override - public <T> ObjectHolder<T> getSetting(Settings<T> settings) { + public <T> T get(Settings<T> settings) { Object o = this.settings.get(settings); if (o == null) - return ObjectHolder.of(settings.getDefaultValue()); - return ObjectHolder.of((T) o); + return settings.getDefaultValue(); + return (T) o; } @Override @@ -62,7 +61,7 @@ public abstract class AbstractEntryStack extends DrawableHelper implements Entry if (!(obj instanceof EntryStack)) return false; EntryStack stack = (EntryStack) obj; - boolean checkTags = getSetting(Settings.CHECK_TAGS).value().get() || stack.getSetting(Settings.CHECK_TAGS).value().get(); + boolean checkTags = get(Settings.CHECK_TAGS).get() || stack.get(Settings.CHECK_TAGS).get(); return equals(stack, !checkTags, true); } |
