aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2022-05-28 17:25:12 +0800
committershedaniel <daniel@shedaniel.me>2022-05-28 17:25:12 +0800
commit56b60c82c3566e471187bbe8b4e93fe4a3fad05f (patch)
treef21c5f5b6b5fce9db2390426fb5d027373ece5b3
parent3a0c6ef56b13691d9cef0a460201306a42f36d08 (diff)
downloadRoughlyEnoughItems-56b60c82c3566e471187bbe8b4e93fe4a3fad05f.tar.gz
RoughlyEnoughItems-56b60c82c3566e471187bbe8b4e93fe4a3fad05f.tar.bz2
RoughlyEnoughItems-56b60c82c3566e471187bbe8b4e93fe4a3fad05f.zip
Allow ctrl+click when cheat mode is on
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/DisplayedEntryWidget.java4
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/DisplayedEntryWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/DisplayedEntryWidget.java
index 58f46abaf..bd15c0da5 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/DisplayedEntryWidget.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/DisplayedEntryWidget.java
@@ -61,7 +61,7 @@ public abstract class DisplayedEntryWidget extends EntryWidget {
@Override
protected boolean doAction(double mouseX, double mouseY, int button) {
- if (ClientHelper.getInstance().isCheating() && !(Minecraft.getInstance().screen instanceof DisplayScreen)) {
+ if (ClientHelper.getInstance().isCheating() && !Screen.hasControlDown() && !(Minecraft.getInstance().screen instanceof DisplayScreen)) {
EntryStack<?> entry = getCurrentEntry().copy();
if (!entry.isEmpty()) {
if (entry.getType() != VanillaEntryTypes.ITEM) {
@@ -88,7 +88,7 @@ public abstract class DisplayedEntryWidget extends EntryWidget {
public boolean cancelDeleteItems(EntryStack<?> stack) {
if (!interactable || !ConfigObject.getInstance().isGrabbingItems())
return super.cancelDeleteItems(stack);
- if (ClientHelper.getInstance().isCheating() && !(Minecraft.getInstance().screen instanceof DisplayScreen)) {
+ if (ClientHelper.getInstance().isCheating() && !Screen.hasControlDown() && !(Minecraft.getInstance().screen instanceof DisplayScreen)) {
EntryStack<?> entry = getCurrentEntry().copy();
if (!entry.isEmpty()) {
if (entry.getType() != VanillaEntryTypes.ITEM) {
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java
index ebb2a87b8..209de8d69 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java
@@ -418,7 +418,7 @@ public class EntryWidget extends Slot implements DraggableStackProviderWidget {
public Tooltip getCurrentTooltip(Point point) {
Tooltip tooltip = getCurrentEntry().getTooltip(point);
- if (tooltip != null && !ClientHelper.getInstance().isCheating() && getTransferHandler() != null
+ if (tooltip != null && getTransferHandler() != null
&& !(Minecraft.getInstance().screen instanceof DisplayScreen)) {
tooltip.add(new TranslatableComponent("text.auto_craft.move_items.tooltip").withStyle(ChatFormatting.YELLOW));
}
@@ -507,7 +507,7 @@ public class EntryWidget extends Slot implements DraggableStackProviderWidget {
}
}
- if (!ClientHelper.getInstance().isCheating() && !(Minecraft.getInstance().screen instanceof DisplayScreen) && Screen.hasControlDown()) {
+ if (!(Minecraft.getInstance().screen instanceof DisplayScreen) && Screen.hasControlDown()) {
try {
TransferHandler handler = getTransferHandler();