aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2022-05-27 20:30:37 +0800
committershedaniel <daniel@shedaniel.me>2022-05-27 20:30:37 +0800
commitbe40970223e29232b8e7b0e8c7fa1ba8ac5262a2 (patch)
treed6e35f344e2825791d1550e5ae6de24311c34034
parent1d0a4480f881350cef45f0f1f76f48cd293a7db8 (diff)
downloadRoughlyEnoughItems-be40970223e29232b8e7b0e8c7fa1ba8ac5262a2.tar.gz
RoughlyEnoughItems-be40970223e29232b8e7b0e8c7fa1ba8ac5262a2.tar.bz2
RoughlyEnoughItems-be40970223e29232b8e7b0e8c7fa1ba8ac5262a2.zip
Disable fluid amount display on JEI slots
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java5
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java2
2 files changed, 6 insertions, 1 deletions
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java b/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java
index 1067ff6d3..5119140aa 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java
@@ -243,6 +243,10 @@ public interface EntryStack<T> extends TextRepresentable, Renderer {
@Environment(EnvType.CLIENT)
public static Settings<Function<EntryStack<?>, List<Component>>> TOOLTIP_APPEND_EXTRA;
@Environment(EnvType.CLIENT)
+ @Deprecated
+ @ApiStatus.Internal
+ public static Settings<Boolean> FLUID_AMOUNT_VISIBLE;
+ @Environment(EnvType.CLIENT)
public static Settings<Float> FLUID_RENDER_RATIO;
static {
@@ -252,6 +256,7 @@ public interface EntryStack<T> extends TextRepresentable, Renderer {
CONTAINING_NS = new Settings<>((stack, ns) -> ns);
TOOLTIP_APPEND_EXTRA = new Settings<>(stack -> Collections.emptyList());
FLUID_RENDER_RATIO = new Settings<>(1.0F);
+ FLUID_AMOUNT_VISIBLE = new Settings<>(true);
});
}
diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java b/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java
index a8329b4c8..5bdfec4c1 100644
--- a/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java
+++ b/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java
@@ -289,7 +289,7 @@ public class FluidEntryDefinition implements EntryDefinition<FluidStack>, EntryS
return null;
List<Component> toolTip = Lists.newArrayList(entry.asFormattedText());
long amount = entry.getValue().getAmount();
- if (amount >= 0) {
+ if (amount >= 0 && entry.get(EntryStack.Settings.FLUID_AMOUNT_VISIBLE)) {
String amountTooltip = I18n.get(FLUID_AMOUNT, entry.getValue().getAmount());
if (amountTooltip != null) {
toolTip.addAll(Stream.of(amountTooltip.split("\n")).map(TextComponent::new).collect(Collectors.toList()));