From be40970223e29232b8e7b0e8c7fa1ba8ac5262a2 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Fri, 27 May 2022 20:30:37 +0800 Subject: Disable fluid amount display on JEI slots --- .../java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/src/main/java/me/shedaniel/rei/plugin/client') 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, EntryS return null; List 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())); -- cgit From 0e6afb30a19e9058b79202b7309d4b9c1d797754 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sat, 28 May 2022 00:28:25 +0800 Subject: Fix #861 --- .../plugin/client/runtime/DefaultClientRuntimePlugin.java | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'runtime/src/main/java/me/shedaniel/rei/plugin/client') diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java b/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java index c0e0fc30e..b10ea8b66 100644 --- a/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java +++ b/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java @@ -221,18 +221,6 @@ public class DefaultClientRuntimePlugin implements REIClientPlugin { @Override public boolean doAction(int button) { - if (!(ClientHelper.getInstance().isCheating() && !(Minecraft.getInstance().screen instanceof DisplayScreen))) return false; - EntryStack entry = stack.copy(); - if (!entry.isEmpty()) { - if (entry.getType() != VanillaEntryTypes.ITEM) { - EntryStack cheatsAs = entry.cheatsAs(); - entry = cheatsAs.isEmpty() ? entry : cheatsAs; - } - if (entry.getType() == VanillaEntryTypes.ITEM) - entry.castValue().setCount(button != 1 && !Screen.hasShiftDown() == (ConfigObject.getInstance().getItemCheatingMode() == ItemCheatingMode.REI_LIKE) ? 1 : entry.castValue().getMaxStackSize()); - return ClientHelper.getInstance().tryCheatingEntry(entry); - } - return false; } -- cgit