Initial 1.18.1

Pylo · Jan 16, 2022 · 0df336e · 0df336e
1 parent 225da4b
commit 0df336e
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 30 deletions.
diff --git a/.idea/runConfigurations/runClient.xml b/.idea/runConfigurations/runClient.xml
diff --git a/.idea/runConfigurations/runServer.xml b/.idea/runConfigurations/runServer.xml
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        maven { url = 'https://files.minecraftforge.net/maven' }
+        maven { url = 'https://maven.minecraftforge.net' }
         mavenCentral()
         gradlePluginPortal()
     }
@@ -19,10 +19,10 @@ archivesBaseName = "mcreator_link"
 
 project.tasks.build.dependsOn project.tasks.shadowJar
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(16)
+java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 minecraft {
-    mappings channel: 'official', version: '1.17.1'
+    mappings channel: 'official', version: '1.18.1'
 
     runs {
         client {
@@ -59,7 +59,7 @@ configurations {
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.17.1-37.0.71'
+    minecraft 'net.minecraftforge:forge:1.18.1-39.0.19'
 
     shadowpack 'com.fazecast:jSerialComm:2.7.0'
 }
@@ -121,7 +121,7 @@ task copyModIntoFinalBuild(type: Copy) {
     from('build/libs/')
     include ('mcreator_link-' + version + '-all.jar')
     into('build/export/')
-    rename { "MCreator Link " + project.version + " [1.17.1].jar" }
+    rename { "MCreator Link " + project.version + " [1.18.1].jar" }
 }
 
 task copyDevModIntoFinalBuild(type: Copy) {
@@ -130,7 +130,7 @@ task copyDevModIntoFinalBuild(type: Copy) {
     from('build/libs/')
     include ('mcreator_link-' + version + '.jar')
     into('build/export/')
-    rename { "MCreator Link " + project.version + " [1.17.1] - Dev.jar" }
+    rename { "MCreator Link " + project.version + " [1.18.1] - Dev.jar" }
 }
 
 task exportArduinoLibrary(type: Zip) {

diff --git a/src/main/java/net/mcreator/minecraft/link/gui/ScreenEventHandler.java b/src/main/java/net/mcreator/minecraft/link/gui/ScreenEventHandler.java
@@ -21,7 +21,7 @@
 import net.minecraft.client.gui.screens.TitleScreen;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.GuiScreenEvent;
+import net.minecraftforge.client.event.ScreenEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import org.lwjgl.glfw.GLFW;
@@ -33,16 +33,16 @@
 	 *
 	 * @param drawScreenEvent ScreenEvent.DrawScreenEvent event instance
 	 */
-	@SubscribeEvent public static void drawScreenEvent(GuiScreenEvent.DrawScreenEvent drawScreenEvent) {
-		if (drawScreenEvent.getGui() instanceof TitleScreen || drawScreenEvent.getGui() instanceof PauseScreen) {
-			drawScreenEvent.getGui().getMinecraft().font.draw(drawScreenEvent.getMatrixStack(),
+	@SubscribeEvent public static void drawScreenEvent(ScreenEvent.DrawScreenEvent drawScreenEvent) {
+		if (drawScreenEvent.getScreen() instanceof TitleScreen || drawScreenEvent.getScreen() instanceof PauseScreen) {
+			drawScreenEvent.getScreen().getMinecraft().font.draw(drawScreenEvent.getPoseStack(),
 					"MCreator Link " + MCreatorLink.VERSION, 3, 3, 0xffffff);
-			drawScreenEvent.getGui().getMinecraft().font.draw(drawScreenEvent.getMatrixStack(),
+			drawScreenEvent.getScreen().getMinecraft().font.draw(drawScreenEvent.getPoseStack(),
 					I18n.get("link.menu.settingskey"), 3, 14, 0xffffff);
 
-			if (GLFW.glfwGetKey(drawScreenEvent.getGui().getMinecraft().getWindow().getWindow(), GLFW.GLFW_KEY_L)
+			if (GLFW.glfwGetKey(drawScreenEvent.getScreen().getMinecraft().getWindow().getWindow(), GLFW.GLFW_KEY_L)
 					== GLFW.GLFW_PRESS)
-				drawScreenEvent.getGui().getMinecraft().setScreen(new GuiMCreatorLink(drawScreenEvent.getGui()));
+				drawScreenEvent.getScreen().getMinecraft().setScreen(new GuiMCreatorLink(drawScreenEvent.getScreen()));
 		}
 	}
 

diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader="javafml"
-loaderVersion="[37,)"
+loaderVersion="[39,)"
 license="Apache License Version 2.0"
 
 [[mods]]
@@ -15,6 +15,6 @@ logoFile="logo.png"
 [[dependencies.test]]
     modId="minecraft"
     mandatory=true
-    versionRange="[1.17.1]"
+    versionRange="[1.18.1]"
     ordering="NONE"
     side="BOTH"