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>

1 files changed, 3 insertions, 2 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/EnchantingSolvers.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/EnchantingSolvers.java
index 16b59b05..83a68915 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/EnchantingSolvers.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/EnchantingSolvers.java
@@ -17,6 +17,7 @@ import net.minecraftforge.client.event.GuiOpenEvent;
 import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
+import org.lwjgl.input.Keyboard;
 
 import java.util.*;
 
@@ -325,7 +326,7 @@ public class EnchantingSolvers {
 						if (chronomatronReplayIndex < chronomatronOrder.size()) {
 							String chronomatronCurrent = chronomatronOrder.get(chronomatronReplayIndex);
 							if (!NotEnoughUpdates.INSTANCE.config.enchantingSolvers.preventMisclicks1 ||
-								chronomatronCurrent.equals(displayName)) {
+								chronomatronCurrent.equals(displayName) || Keyboard.getEventKey() == Keyboard.KEY_LSHIFT) {
 								chronomatronReplayIndex++;
 								Minecraft.getMinecraft().playerController.windowClick(windowId, slotId,
 									2, mode, Minecraft.getMinecraft().thePlayer
@@ -356,7 +357,7 @@ public class EnchantingSolvers {
 						long currentTime = System.currentTimeMillis();
 						if (currentTime - millisLastClick > 150 &&
 							(!NotEnoughUpdates.INSTANCE.config.enchantingSolvers.preventMisclicks1 ||
-								current.containerIndex == slotId)) {
+								current.containerIndex == slotId || Keyboard.getEventKey() == Keyboard.KEY_LSHIFT)) {
 							ultrasequencerReplayIndex++;
 							Minecraft.getMinecraft().playerController.windowClick(windowId, slotId,
 								2, mode, Minecraft.getMinecraft().thePlayer