update MC and Forge to 1.18.1

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        maven { url = 'https://files.minecraftforge.net/maven' }
+        maven { url = 'https://maven.minecraftforge.net' }
         mavenCentral()
     }
     dependencies {

gradle.properties

@@ -4,15 +4,15 @@ org.gradle.daemon=false
 author=thetadev
 modid=constructionwand
 
-mcversion=1.18
-forgeversion=38.0.16
+mcversion=1.18.1
+forgeversion=39.0.0
 mcp_channel=official
-mcp_mappings=1.18
+mcp_mappings=1.18.1
 
 # Source: https://maven.blamejared.com/vazkii/botania/Botania/
 # botania=1.16.2-405
 # Source: https://dvs1.progwml6.com/files/maven/mezz/jei/
-jei_version=jei-1.18:9.0.0.40
+jei_version=jei-1.18.1:9.1.0.41
 
 version_major=2
-version_minor=5
+version_minor=6

src/main/java/thetadev/constructionwand/client/ScreenWand.java

@@ -1,6 +1,7 @@
 package thetadev.constructionwand.client;
 
 import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
@@ -53,9 +54,13 @@ public class ScreenWand extends Screen
     }
 
     @Override
-    public boolean charTyped(char character, int code) {
-        if(character == 'e') onClose();
-        return super.charTyped(character, code);
+    public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
+        if (Minecraft.getInstance().options.keyInventory.matches(keyCode, scanCode)) {
+            this.onClose();
+            return true;
+        } else {
+            return super.keyPressed(keyCode, scanCode, modifiers);
+        }
     }
 
     private void createButton(int cx, int cy, IOption<?> option) {