aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/shedaniel/rei/api/EntryStack.java
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2020-01-09 12:40:17 +0800
committershedaniel <daniel@shedaniel.me>2020-01-09 12:40:17 +0800
commitaf08708b9616f5b7e857b93f6848f73356cbe458 (patch)
tree474bfb5eef31289ab0b3f89e22d2e33804eba7e2 /src/main/java/me/shedaniel/rei/api/EntryStack.java
parentc7ec6b900f33620819abb5044409c30d26c31d8f (diff)
downloadRoughlyEnoughItems-af08708b9616f5b7e857b93f6848f73356cbe458.tar.gz
RoughlyEnoughItems-af08708b9616f5b7e857b93f6848f73356cbe458.tar.bz2
RoughlyEnoughItems-af08708b9616f5b7e857b93f6848f73356cbe458.zip
Compact Tabs
Diffstat (limited to 'src/main/java/me/shedaniel/rei/api/EntryStack.java')
-rw-r--r--src/main/java/me/shedaniel/rei/api/EntryStack.java19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/main/java/me/shedaniel/rei/api/EntryStack.java b/src/main/java/me/shedaniel/rei/api/EntryStack.java
index 1fd04a1d9..65c0ccd2b 100644
--- a/src/main/java/me/shedaniel/rei/api/EntryStack.java
+++ b/src/main/java/me/shedaniel/rei/api/EntryStack.java
@@ -166,7 +166,12 @@ public interface EntryStack {
return setting(settings, value);
}
- <T> ObjectHolder<T> getSetting(Settings<T> settings);
+ @Deprecated
+ default <T> ObjectHolder<T> getSetting(Settings<T> settings) {
+ return ObjectHolder.of(get(settings));
+ }
+
+ <T> T get(Settings<T> settings);
@Nullable
QueuedTooltip getTooltip(int mouseX, int mouseY);
@@ -183,11 +188,11 @@ public interface EntryStack {
class Settings<T> {
public static final Supplier<Boolean> TRUE = () -> true;
public static final Supplier<Boolean> FALSE = () -> false;
- public static final Settings<Supplier<Boolean>> RENDER = new Settings(TRUE);
- public static final Settings<Supplier<Boolean>> CHECK_TAGS = new Settings(FALSE);
- public static final Settings<Supplier<Boolean>> TOOLTIP_ENABLED = new Settings(TRUE);
- public static final Settings<Supplier<Boolean>> TOOLTIP_APPEND_MOD = new Settings(TRUE);
- public static final Settings<Supplier<Boolean>> RENDER_COUNTS = new Settings(TRUE);
+ public static final Settings<Supplier<Boolean>> RENDER = new Settings<>(TRUE);
+ public static final Settings<Supplier<Boolean>> CHECK_TAGS = new Settings<>(FALSE);
+ public static final Settings<Supplier<Boolean>> TOOLTIP_ENABLED = new Settings<>(TRUE);
+ public static final Settings<Supplier<Boolean>> TOOLTIP_APPEND_MOD = new Settings<>(TRUE);
+ public static final Settings<Supplier<Boolean>> RENDER_COUNTS = new Settings<>(TRUE);
public static final Settings<Function<EntryStack, List<String>>> TOOLTIP_APPEND_EXTRA = new Settings<Function<EntryStack, List<String>>>(stack -> Collections.emptyList());
public static final Settings<Function<EntryStack, String>> COUNTS = new Settings<Function<EntryStack, String>>(stack -> null);
@@ -202,7 +207,7 @@ public interface EntryStack {
}
public static class Item {
- public static final Settings<Supplier<Boolean>> RENDER_ENCHANTMENT_GLINT = new Settings(TRUE);
+ public static final Settings<Supplier<Boolean>> RENDER_ENCHANTMENT_GLINT = new Settings<>(TRUE);
@Deprecated public static final Settings<Supplier<Boolean>> RENDER_OVERLAY = RENDER_ENCHANTMENT_GLINT;
private Item() {