Fix #137, bump version to 4.2.1

CottonMC · Sep 12, 2021 · 8eb2a20 · 8eb2a20
1 parent c6cf5eb
commit 8eb2a20
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.11.6
 
 # Mod Properties
-	mod_version = 4.2.0
+	mod_version = 4.2.1
 	maven_group = io.github.cottonmc
 	archives_base_name = LibGui
 

diff --git a/src/main/java/io/github/cottonmc/cotton/gui/client/CottonInventoryScreen.java b/src/main/java/io/github/cottonmc/cotton/gui/client/CottonInventoryScreen.java
@@ -163,21 +163,12 @@ public boolean charTyped(char ch, int keyCode) {
 
 	@Override
 	public boolean keyPressed(int ch, int keyCode, int modifiers) {
-		//System.out.println("Key " + Integer.toHexString(ch)+" "+Integer.toHexString(keyCode));
-		if (ch==GLFW.GLFW_KEY_ESCAPE) {
-			onClose();
-			return true;
-		} else if (ch==GLFW.GLFW_KEY_TAB) {
-			changeFocus(!hasShiftDown());
-			return true;
+		if (ch == GLFW.GLFW_KEY_ESCAPE || ch == GLFW.GLFW_KEY_TAB) {
+			// special hardcoded keys, these will never be delivered to widgets
+			return super.keyPressed(ch, keyCode, modifiers);
 		} else {
-			//if (super.keyPressed(ch, keyCode, modifiers)) return true;
 			if (description.getFocus()==null) {
-				if (client.options.keyInventory.matchesKey(ch, keyCode)) {
-					this.client.player.closeHandledScreen();
-					return true;
-				}
-				return false;
+				return super.keyPressed(ch, keyCode, modifiers);
 			} else {
 				description.getFocus().onKeyPressed(ch, keyCode, modifiers);
 				return true;