diff --git a/build.gradle b/build.gradle index 5b50303..ddf9394 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { repositories { - maven { url = 'https://maven.minecraftforge.net' } + maven { url = 'https://files.minecraftforge.net/maven' } mavenCentral() } dependencies { diff --git a/gradle.properties b/gradle.properties index 40a8f6b..b8ebd1b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.daemon=false author=thetadev modid=constructionwand -mcversion=1.18.1 -forgeversion=39.0.0 +mcversion=1.18 +forgeversion=38.0.16 mcp_channel=official -mcp_mappings=1.18.1 +mcp_mappings=1.18 # 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.1:9.1.0.41 +jei_version=jei-1.18:9.0.0.40 version_major=2 -version_minor=6 \ No newline at end of file +version_minor=5 \ 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 d665e83..a746bab 100644 --- a/src/main/java/thetadev/constructionwand/client/ScreenWand.java +++ b/src/main/java/thetadev/constructionwand/client/ScreenWand.java @@ -1,7 +1,6 @@ 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; @@ -54,13 +53,9 @@ public class ScreenWand extends Screen } @Override - 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); - } + public boolean charTyped(char character, int code) { + if(character == 'e') onClose(); + return super.charTyped(character, code); } 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 new file mode 100644 index 0000000..7fc945c Binary files /dev/null and b/src/main/resources/assets/constructionwand/textures/block/conjured_block.png differ