aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java
diff options
context:
space:
mode:
authorNopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>2022-04-18 10:54:18 +0000
committerGitHub <noreply@github.com>2022-04-18 12:54:18 +0200
commit9fe86ccb4d30b78826e513a6576027ca6e4c1600 (patch)
treead63737ab7fa06daa6554a7c873142c10d32c167 /src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java
parentc983bb5785318c54d5be59907410b4dfe6d39b64 (diff)
downloadnotenoughupdates-9fe86ccb4d30b78826e513a6576027ca6e4c1600.tar.gz
notenoughupdates-9fe86ccb4d30b78826e513a6576027ca6e4c1600.tar.bz2
notenoughupdates-9fe86ccb4d30b78826e513a6576027ca6e4c1600.zip
Fixed stuff from the project board (#112)
* Fix /et not closing when clicking inventory keybind * Made it so calendar timer in inventory works if you have no event data * Made it if you hold shift in the enchant solvers it overrides prevent missclicks * Revert "Made it so calendar timer in inventory works if you have no event data" This reverts commit d2ee3ebc679da5a231d35a9d54eb10c701daff1d. * made crash not crash * consistency fixes for my heart * fix https://cdn.discordapp.com/attachments/832652653292027904/964353119557394462/unknown.png * fix https://i.imgur.com/Z3qChN3.png Co-authored-by: jani270 <jani270@gmx.de>
Diffstat (limited to 'src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java')
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java
index f5838052..25869452 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java
@@ -1899,6 +1899,7 @@ public class GuiCustomEnchant extends Gui {
}
return Keyboard.getEventKey() != Keyboard.KEY_ESCAPE &&
+ Keyboard.getEventKey() != Minecraft.getMinecraft().gameSettings.keyBindInventory.getKeyCode() &&
(!NotEnoughUpdates.INSTANCE.config.slotLocking.enableSlotLocking ||
Keyboard.getEventKey() != NotEnoughUpdates.INSTANCE.config.slotLocking.slotLockKey);
}