From 0ac028acfe1d06d9d996117aed694e494082865e Mon Sep 17 00:00:00 2001 From: Nyfaria DragonMoose Date: Tue, 5 Apr 2022 17:48:08 -0500 Subject: [PATCH] Updated to 1.18.X HEre you go you lazy bumm --- build.gradle | 6 ++--- build.properties | 6 ++--- .../com/mattsmeets/macrokey/MacroKey.java | 6 ++--- .../handler/hook/GuiEventHandler.java | 23 ++++++++++--------- src/main/resources/META-INF/mods.toml | 4 ++-- 5 files changed, 23 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index 991b2dc..6931f7c 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ if (!project.hasProperty('signingKeystore')) { } // Mojang ships Java 16 to end users in 1.17+ instead of Java 8 in 1.16 or lower, so your mod should target Java 16. -java.toolchain.languageVersion = JavaLanguageVersion.of(16) +java.toolchain.languageVersion = JavaLanguageVersion.of(17) println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch')) minecraft { @@ -55,7 +55,7 @@ minecraft { // // Use non-default mappings at your own risk. They may not always work. // Simply re-run your setup task after changing the mappings to update your workspace. - mappings channel: 'official', version: '1.17.1' + mappings channel: 'official', version: '1.18' // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default. @@ -150,7 +150,7 @@ dependencies { // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed // that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied. // The userdev artifact is a special name and will get all sorts of transformations applied to it. - minecraft 'net.minecraftforge:forge:1.17.1-37.0.103' + minecraft 'net.minecraftforge:forge:1.18.1-39.1.2' testImplementation "junit:junit:4.13.2" testImplementation 'org.mockito:mockito-core:2.28.2' // Real mod deobf dependency examples - these get remapped to your current mappings diff --git a/build.properties b/build.properties index a3dbb9e..51855e8 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ -mod_version=2.1.0 +mod_version=3.0.0 mod_name=MacroKey Keybinding mod_group=com.mattsmeets.macrokey -mc_version=1.17.1 +mc_version=1.18.1 forge_version=37.0.103 update_url=http://mod-versioning.mattsmeets.com/macrokey.json -accepted_versions=[1.17.1] +accepted_versions=[1.18.1] diff --git a/src/main/java/com/mattsmeets/macrokey/MacroKey.java b/src/main/java/com/mattsmeets/macrokey/MacroKey.java index 45ccaad..531f017 100644 --- a/src/main/java/com/mattsmeets/macrokey/MacroKey.java +++ b/src/main/java/com/mattsmeets/macrokey/MacroKey.java @@ -16,14 +16,14 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.resources.language.I18n; import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.client.ClientRegistry; import net.minecraftforge.client.settings.KeyConflictContext; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.server.ServerStartingEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; -import net.minecraftforge.fmlclient.registry.ClientRegistry; -import net.minecraftforge.fmlserverevents.FMLServerStartingEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.lwjgl.glfw.GLFW; @@ -44,7 +44,7 @@ public MacroKey() { MinecraftForge.EVENT_BUS.addListener(this::onServerStarting); } - private void onServerStarting(final FMLServerStartingEvent event) { + private void onServerStarting(final ServerStartingEvent event) { new CommandMacroKey(event.getServer().getCommands().getDispatcher()); } diff --git a/src/main/java/com/mattsmeets/macrokey/handler/hook/GuiEventHandler.java b/src/main/java/com/mattsmeets/macrokey/handler/hook/GuiEventHandler.java index c92f764..09ac817 100644 --- a/src/main/java/com/mattsmeets/macrokey/handler/hook/GuiEventHandler.java +++ b/src/main/java/com/mattsmeets/macrokey/handler/hook/GuiEventHandler.java @@ -13,7 +13,8 @@ import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.TranslatableComponent; -import net.minecraftforge.client.event.GuiScreenEvent; +import net.minecraftforge.client.event.ScreenEvent; +import net.minecraftforge.client.event.ScreenEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -38,9 +39,9 @@ public GuiEventHandler(final ModState modState) { * @param event The init GUI event. */ @SubscribeEvent - public void init(final GuiScreenEvent.InitGuiEvent event) { - final Screen gui = event.getGui(); - if (isNotMainMenu(event.getGui())) return; + public void init(final ScreenEvent.InitScreenEvent event) { + final Screen gui = event.getScreen(); + if (isNotMainMenu(event.getScreen())) return; if (isSwitchButtonDisabled()) return; switchButton = new Button( @@ -57,7 +58,7 @@ public void onClick(double mouseX, double mouseY) { } }; - event.addWidget(switchButton); + event.addListener(switchButton); } /** @@ -67,8 +68,8 @@ public void onClick(double mouseX, double mouseY) { * @param event The mouse click event. */ @SubscribeEvent(receiveCanceled = true) - public void mouseClickedEvent(final GuiScreenEvent.MouseClickedEvent.Post event) { - if (isNotMainMenu(event.getGui()) + public void mouseClickedEvent(final ScreenEvent.MouseClickedEvent.Post event) { + if (isNotMainMenu(event.getScreen()) || isSwitchButtonDisabled() || switchButton == null || !switchButton.isMouseOver(event.getMouseX(), event.getMouseY())) { @@ -84,17 +85,17 @@ public void mouseClickedEvent(final GuiScreenEvent.MouseClickedEvent.Post event) * @param event The draw screen event. */ @SubscribeEvent(receiveCanceled = true) - public void render(final GuiScreenEvent.DrawScreenEvent.Post event) { - if (isNotMainMenu(event.getGui()) + public void render(final ScreenEvent.DrawScreenEvent.Post event) { + if (isNotMainMenu(event.getScreen()) || isSwitchButtonDisabled() || switchButton == null - || !switchButton.isHovered()) { + || !switchButton.isHoveredOrFocused()) { return; } final MouseHandler mouseHelper = Minecraft.getInstance().mouseHandler; PoseStack posestack = new PoseStack(); - event.getGui().renderTooltip( + event.getScreen().renderTooltip( posestack, new TranslatableComponent("text.layer.hover.right_click"), (int) (mouseHelper.xpos() / 2), diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index ea165ea..2687090 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -40,7 +40,7 @@ This mod enables the use of commands that you can bind to keys. PSA to all admin # Does this dependency have to exist - if not, ordering below must be specified mandatory=true #mandatory # The version range of the dependency - versionRange="[37,)" #mandatory + versionRange="[39,)" #mandatory # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory ordering="NONE" # Side this dependency is applied on - BOTH, CLIENT or SERVER @@ -50,6 +50,6 @@ This mod enables the use of commands that you can bind to keys. PSA to all admin modId="minecraft" mandatory=true # This version range declares a minimum of the current minecraft version up to but not including the next major version - versionRange="[1.17.1,1.18)" + versionRange="[1.18.1,1.19)" ordering="NONE" side="CLIENT"