From 1a92028f3b019eca1cf2d460f598bb131dae8457 Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Sat, 5 Jun 2021 00:22:57 +0300 Subject: Update Mod Menu support --- build.gradle | 5 ++--- gradle.properties | 2 +- .../io/github/cottonmc/cotton/gui/impl/modmenu/ModMenuSupport.java | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index cb215c6..b73c0d9 100644 --- a/build.gradle +++ b/build.gradle @@ -40,10 +40,9 @@ dependencies { // Using modApi instead of api because of https://github.com/FabricMC/fabric-loom/issues/200 include modApi("io.github.juuxel:libninepatch:${project.libninepatch_version}") - // TODO: Add runtime when ModMenu updates to 1.17 - modCompileOnly("com.terraformersmc:modmenu:$project.modmenu_version") { + modRuntime(modCompileOnly("com.terraformersmc:modmenu:$project.modmenu_version") { exclude group: 'net.fabricmc.fabric-api' - } + }) } processResources { diff --git a/gradle.properties b/gradle.properties index 41e24fb..40137f6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,5 +15,5 @@ org.gradle.jvmargs=-Xmx1G # Dependencies fabric_version=0.34.8+1.17 jankson_version=3.0.1+j1.2.0 - modmenu_version=1.14.15 + modmenu_version=2.0.0-beta.7 libninepatch_version=1.1.0 diff --git a/src/main/java/io/github/cottonmc/cotton/gui/impl/modmenu/ModMenuSupport.java b/src/main/java/io/github/cottonmc/cotton/gui/impl/modmenu/ModMenuSupport.java index 80b57bf..60e62cb 100644 --- a/src/main/java/io/github/cottonmc/cotton/gui/impl/modmenu/ModMenuSupport.java +++ b/src/main/java/io/github/cottonmc/cotton/gui/impl/modmenu/ModMenuSupport.java @@ -2,9 +2,9 @@ package io.github.cottonmc.cotton.gui.impl.modmenu; import net.minecraft.text.TranslatableText; +import com.terraformersmc.modmenu.api.ConfigScreenFactory; +import com.terraformersmc.modmenu.api.ModMenuApi; import io.github.cottonmc.cotton.gui.client.CottonClientScreen; -import io.github.prospector.modmenu.api.ConfigScreenFactory; -import io.github.prospector.modmenu.api.ModMenuApi; public class ModMenuSupport implements ModMenuApi { @Override -- cgit