Merge remote-tracking branch 'origin/8.x-1.18.2' into 9.x-1.19

2 files changed, 1 insertions, 13 deletions

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 4f3838fdb..0ddc12cd7 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
@@ -288,7 +288,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(Component::literal).collect(Collectors.toList()));
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 5e30527cf..772f659ff 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
@@ -222,18 +222,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<ItemStack> cheatsAs = entry.cheatsAs();
-                    entry = cheatsAs.isEmpty() ? entry : cheatsAs;
-                }
-                if (entry.getType() == VanillaEntryTypes.ITEM)
-                    entry.<ItemStack>castValue().setCount(button != 1 && !Screen.hasShiftDown() == (ConfigObject.getInstance().getItemCheatingMode() == ItemCheatingMode.REI_LIKE) ? 1 : entry.<ItemStack>castValue().getMaxStackSize());
-                return ClientHelper.getInstance().tryCheatingEntry(entry);
-            }
-            
             return false;
         }