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>

11 files changed, 32 insertions, 13 deletions

diff --git a/Update Notes/2.1.md b/Update Notes/2.1.md
index cb117f31..18a4ba8a 100644
--- a/Update Notes/2.1.md
+++ b/Update Notes/2.1.md
@@ -78,6 +78,7 @@
 - Added a subcommand to /neupackdev to get the NBT of the closest mob, armor stand, and npc in a radius in the loaded world - whalker
 - Added optional radius argument for neupackdev subcommands. - whalker
 - Added tab completion to /neupackdev subcommands. - whalker
+- Made it if you hold shift in the enchant solvers it overrides prevent missclicks
 ### **Bug Fixes:**
 - Fix wiki pages freezing the entire game - nea89
 - Made titanium overlay and waypoints work with dwarven overlay off
@@ -105,6 +106,7 @@
 - Added checks for chat messages for dungeon win overlay
 - Fixed minion tiers crafted by coop members not showing up in /pv - Lulonaut
 - Fixed crash in /pv when the player had a pet that is not saved in the repo - Lulonaut
+- Made it so you can close /et with your inventory keybind
 ### **Other:**
 - New icons was added in storage_icons.png
 - Moved the help icon in /neucustomize over a little
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
index 75bff803..7965abae 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
@@ -775,8 +775,8 @@ public class NEUOverlay extends Gui {
 			displayInformationPane(new TextInfoPane(
 				this,
 				manager,
-				"Loading",
-				"Loading your requested information about " + name + "."
+				EnumChatFormatting.GRAY + "Loading",
+				EnumChatFormatting.GRAY + "Loading your requested information about " + name + EnumChatFormatting.GRAY + "."
 			));
 			infoPaneLoadingJob = InfoPane.create(this, manager, infoType, name, internalname, infoText)
 																	 .thenAccept(this::displayInformationPane);
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/listener/ItemTooltipListener.java b/src/main/java/io/github/moulberry/notenoughupdates/listener/ItemTooltipListener.java
index 52729143..cc2b11e8 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/listener/ItemTooltipListener.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/listener/ItemTooltipListener.java
@@ -929,7 +929,7 @@ public class ItemTooltipListener {
 		} else if (NotEnoughUpdates.INSTANCE.packDevEnabled) {
 			event.toolTip.add("");
 			event.toolTip.add(EnumChatFormatting.AQUA + "NEU Pack Dev Info:");
-			event.toolTip.add("Press " + EnumChatFormatting.GOLD + "[KEY]" + EnumChatFormatting.GRAY + " to copy line");
+			event.toolTip.add(EnumChatFormatting.GRAY + "Press " + EnumChatFormatting.GOLD + "[KEY]" + EnumChatFormatting.GRAY + " to copy line");
 
 			String internal = NotEnoughUpdates.INSTANCE.manager.getInternalNameForItem(event.itemStack);
 
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
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/AccessoryBagOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/AccessoryBagOverlay.java
index f2205c49..95e21cd0 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/AccessoryBagOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/AccessoryBagOverlay.java
@@ -836,7 +836,7 @@ public class AccessoryBagOverlay {
 			GuiChest eventGui = (GuiChest) Minecraft.getMinecraft().currentScreen;
 			ContainerChest cc = (ContainerChest) eventGui.inventorySlots;
 			String containerName = cc.getLowerChestInventory().getDisplayName().getUnformattedText();
-			if (containerName.trim().startsWith("Accessory Bag")) {
+			if (containerName.trim().startsWith("Accessory Bag") && !containerName.contains("Thaumaturgy") && !containerName.contains("Upgrades")) {
 				inAccessoryBag = true;
 				try {
 					int xSize = (int) Utils.getField(GuiContainer.class, eventGui, "xSize", "field_146999_f");
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
index 98d8f11d..a9cf44c4 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
@@ -1000,6 +1000,21 @@ public class CalendarOverlay {
 						GlStateManager.translate(0, 0, -100);
 					}
 				}
+			} else if (!enabled && NotEnoughUpdates.INSTANCE.config.calendar.showEventTimerInInventory) {
+				FontRenderer fr = Minecraft.getMinecraft().fontRendererObj;
+
+				GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+				GlStateManager.disableFog();
+				GlStateManager.disableLighting();
+				GlStateManager.disableColorMaterial();
+
+				renderBlurredBackground(10, width, height, guiLeft + 3, guiTop + 3, xSize - 6, ySize - 6);
+
+				Minecraft.getMinecraft().getTextureManager().bindTexture(DISPLAYBAR);
+				Utils.drawTexturedRect(guiLeft, guiTop, xSize, 20, GL11.GL_NEAREST);
+
+				String nextS = EnumChatFormatting.RED + "Open calendar to see events";
+				fr.drawString(nextS, guiLeft + 8, guiTop + 6, -1, false);
 			}
 		}
 		GlStateManager.translate(0, 0, -10);
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);
 	}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AHGraph.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AHGraph.java
index 8d3acaf9..ad96f744 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AHGraph.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AHGraph.java
@@ -27,7 +27,7 @@ public class AHGraph {
 		desc = "Change the style of the graph GUI"
 	)
 	@ConfigEditorDropdown(
-		values = {"Minecraft", "Dark", "PacksHQ Dark", "FSR"}
+		values = {"Minecraft", "Grey", "PacksHQ Dark", "FSR"}
 	)
 	public int graphStyle = 0;
 
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/CustomArmour.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/CustomArmour.java
index 57a5e1d7..f1b2338f 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/CustomArmour.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/CustomArmour.java
@@ -25,11 +25,11 @@ public class CustomArmour {
 
 	@Expose
 	@ConfigOption(
-		name = "GUI Colour",
+		name = "GUI Style",
 		desc = "Change the colour of the GUI"
 	)
 	@ConfigEditorDropdown(
-		values = {"Vanilla", "Grey", "Dark", "Transparent", "FSR"}
+		values = {"Minecraft", "Grey", "PacksHQ Dark", "Transparent", "FSR"}
 	)
 	public int colourStyle = 0;
 
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/PetOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/PetOverlay.java
index 1cef5faf..6f96e972 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/PetOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/PetOverlay.java
@@ -62,7 +62,7 @@ public class PetOverlay {
 		desc = "Change the style of the Pet Info overlay"
 	)
 	@ConfigEditorDropdown(
-		values = {"Background", "No Shadow", "Shadow Only", "Full Shadow"}
+		values = {"Background", "No Shadow", "Shadow", "Full Shadow"}
 	)
 	public int petInfoOverlayStyle = 0;
 
@@ -84,11 +84,11 @@ public class PetOverlay {
 
 	@Expose
 	@ConfigOption(
-		name = "GUI Colour",
+		name = "GUI Style",
 		desc = "Change the colour of the GUI"
 	)
 	@ConfigEditorDropdown(
-		values = {"Vanilla", "Grey", "Dark", "Transparent", "FSR"}
+		values = {"Minecraft", "Grey", "PacksHQ Dark", "Transparent", "FSR"}
 	)
 	public int colourStyle = 0;
 
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/StorageGUI.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/StorageGUI.java
index 2e765777..bdc9ee1b 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/StorageGUI.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/StorageGUI.java
@@ -54,7 +54,7 @@ public class StorageGUI {
 		desc = "Change the visual style of the overlay"
 	)
 	@ConfigEditorDropdown(
-		values = {"Transparent", "Minecraft", "Dark", "Custom"}
+		values = {"Transparent", "Minecraft", "Grey", "Custom"}
 	)
 	@ConfigAccordionId(id = 1)
 	public int displayStyle = 0;