diff --git a/gradle.properties b/gradle.properties index dcc329f..64e5b70 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,4 @@ mcp_mappings=1.17.1 jei_version=jei-1.17.1:8.3.0.39 version_major=2 -version_minor=5 \ No newline at end of file +version_minor=6 \ No newline at end of file diff --git a/src/main/java/thetadev/constructionwand/client/ScreenWand.java b/src/main/java/thetadev/constructionwand/client/ScreenWand.java index a746bab..d665e83 100644 --- a/src/main/java/thetadev/constructionwand/client/ScreenWand.java +++ b/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) { diff --git a/src/main/resources/assets/constructionwand/textures/block/conjured_block.png b/src/main/resources/assets/constructionwand/textures/block/conjured_block.png deleted file mode 100644 index 7fc945c..0000000 Binary files a/src/main/resources/assets/constructionwand/textures/block/conjured_block.png and /dev/null differ