From 68bf1f399a3e21cb003eac1217acd22e5e6a6cdb Mon Sep 17 00:00:00 2001
From: PepperBell <44146161+PepperCode1@users.noreply.github.com>
Date: Sun, 28 Nov 2021 18:50:27 -0800
Subject: [PATCH] Fix toolbox regression

- Fix toolbox menu closing regression
---
 .../toolbox/RadialToolboxMenu.java            | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/simibubi/create/content/curiosities/toolbox/RadialToolboxMenu.java b/src/main/java/com/simibubi/create/content/curiosities/toolbox/RadialToolboxMenu.java
index e8c2e5e29..8d09f7b39 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/toolbox/RadialToolboxMenu.java
+++ b/src/main/java/com/simibubi/create/content/curiosities/toolbox/RadialToolboxMenu.java
@@ -351,14 +351,6 @@ public class RadialToolboxMenu extends AbstractSimiScreen {
 
 	@Override
 	public boolean keyPressed(int code, int scanCode, int modifiers) {
-		InputConstants.Key mouseKey = InputConstants.getKey(code, scanCode);
-		if (AllKeys.TOOLBELT.getKeybind()
-			.isActiveAndMatches(mouseKey)) {
-			onClose();
-			ToolboxHandlerClient.COOLDOWN = 2;
-			return true;
-		}
-
 		KeyMapping[] hotbarBinds = minecraft.options.keyHotbarSlots;
 		for (int i = 0; i < hotbarBinds.length && i < 8; i++) {
 			if (hotbarBinds[i].matches(code, scanCode)) {
@@ -385,6 +377,17 @@ public class RadialToolboxMenu extends AbstractSimiScreen {
 		return super.keyPressed(code, scanCode, modifiers);
 	}
 
+	@Override
+	public boolean keyReleased(int code, int scanCode, int modifiers) {
+		InputConstants.Key mouseKey = InputConstants.getKey(code, scanCode);
+		if (AllKeys.TOOLBELT.getKeybind()
+			.isActiveAndMatches(mouseKey)) {
+			onClose();
+			return true;
+		}
+		return super.keyReleased(code, scanCode, modifiers);
+	}
+
 	public static enum State {
 		SELECT_BOX, SELECT_ITEM, SELECT_ITEM_UNEQUIP, DETACH
 	}