From 6c96bb25ba5073ec107e2f9aa7f3b28014375156 Mon Sep 17 00:00:00 2001 From: Theta-Dev Date: Sun, 12 Dec 2021 10:47:22 +0100 Subject: [PATCH 1/2] fix #47 crash when pressing E inside wand gui --- gradle.properties | 2 +- .../thetadev/constructionwand/client/ScreenWand.java | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) 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) { From a0b7ec9246d234c3ec16b8196760126372101962 Mon Sep 17 00:00:00 2001 From: Theta-Dev Date: Sun, 12 Dec 2021 11:01:42 +0100 Subject: [PATCH 2/2] removed unused block texture --- .../textures/block/conjured_block.png | Bin 5594 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/resources/assets/constructionwand/textures/block/conjured_block.png 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 7fc945cb73067de2671ef016b8fa8bd764c9255e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5594 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