From f8be3a5098beacf0e90159c8c95d937f41ae38b3 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Sat, 28 May 2022 00:28:25 +0800
Subject: Fix #861

---
 .../rei/impl/client/gui/widget/region/RegionEntryWidget.java |  2 +-
 .../rei/plugin/client/DefaultClientRuntimePlugin.java        | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

(limited to 'runtime/src/main/java')

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/region/RegionEntryWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/region/RegionEntryWidget.java
index 436ce315c..338f2a6d1 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/region/RegionEntryWidget.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/region/RegionEntryWidget.java
@@ -137,7 +137,7 @@ public class RegionEntryWidget<T extends RegionEntry<T>> extends DisplayedEntryW
     
     @Override
     protected boolean doAction(double mouseX, double mouseY, int button) {
-        return entry.getEntry().doAction(button);
+        return entry.getEntry().doAction(button) || super.doAction(mouseX, mouseY, button);
     }
     
     public RealRegionEntry<T> getEntry() {
diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientRuntimePlugin.java b/runtime/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientRuntimePlugin.java
index dae157aae..ecacecaac 100644
--- a/runtime/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientRuntimePlugin.java
+++ b/runtime/src/main/java/me/shedaniel/rei/plugin/client/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<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;
         }
         
-- 
cgit