diff options
| author | shedaniel <daniel@shedaniel.me> | 2022-05-23 23:53:08 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2022-05-23 23:53:08 +0800 |
| commit | 68b4c256d113b49a0857515f6edf41496e4920e1 (patch) | |
| tree | c4aeaf1a65358209ea2e7e42512a2715cd990df7 /runtime | |
| parent | fc513305d045356b2d484bb6300e3bad9de8e2bf (diff) | |
| parent | f3bbb3beb0faa4b2abf4d6946129e520a75ec86d (diff) | |
| download | RoughlyEnoughItems-68b4c256d113b49a0857515f6edf41496e4920e1.tar.gz RoughlyEnoughItems-68b4c256d113b49a0857515f6edf41496e4920e1.tar.bz2 RoughlyEnoughItems-68b4c256d113b49a0857515f6edf41496e4920e1.zip | |
Merge remote-tracking branch 'origin/8.x-1.18.2' into 9.x-1.19
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/DisplayedEntryWidget.java | 19 |
1 files changed, 10 insertions, 9 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 867e3002f..d0643c592 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,16 +61,17 @@ 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))) return false; - EntryStack<?> entry = getCurrentEntry().copy(); - if (!entry.isEmpty()) { - if (entry.getType() != VanillaEntryTypes.ITEM) { - EntryStack<ItemStack> cheatsAs = entry.cheatsAs(); - entry = cheatsAs.isEmpty() ? entry : cheatsAs; + if (ClientHelper.getInstance().isCheating() && !(Minecraft.getInstance().screen instanceof DisplayScreen)) { + EntryStack<?> entry = getCurrentEntry().copy(); + if (!entry.isEmpty()) { + if (entry.getType() != VanillaEntryTypes.ITEM) { + EntryStack<ItemStack> cheatsAs = entry.cheatsAs(); + entry = cheatsAs.isEmpty() ? entry : cheatsAs; + } + if (entry.getValueType() == ItemStack.class) + entry.<ItemStack>castValue().setCount(button != 1 && !Screen.hasShiftDown() == (ConfigObject.getInstance().getItemCheatingMode() == ItemCheatingMode.REI_LIKE) ? 1 : entry.<ItemStack>castValue().getMaxStackSize()); + return ClientHelper.getInstance().tryCheatingEntry(entry); } - if (entry.getValueType() == ItemStack.class) - 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 super.doAction(mouseX, mouseY, button); |
