diff options
| -rw-r--r-- | build.gradle | 10 | ||||
| -rw-r--r-- | gradle.properties | 10 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rw-r--r-- | src/main/java/io/github/cottonmc/cotton/gui/client/modmenu/ModMenuSupport.java | 7 |
4 files changed, 14 insertions, 15 deletions
diff --git a/build.gradle b/build.gradle index 1691af2..d7c3955 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'fabric-loom' version '0.5-SNAPSHOT' id 'maven-publish' - id "com.jfrog.artifactory" version "4.9.0" + id "com.jfrog.artifactory" version "4.20.0" id 'checkstyle' } @@ -20,6 +20,12 @@ group = project.maven_group repositories { maven { url "http://server.bbkr.space:8081/artifactory/libs-release" } + maven { + url = "http://maven.terraformersmc.com/releases" + content { + includeGroup "com.terraformersmc" + } + } } dependencies { @@ -30,7 +36,7 @@ dependencies { modImplementation "io.github.cottonmc:Jankson-Fabric:${project.jankson_version}" include "io.github.cottonmc:Jankson-Fabric:${project.jankson_version}" - modRuntime(modCompileOnly("io.github.prospector:modmenu:$project.modmenu_version") { + modRuntime(modCompileOnly("com.terraformersmc:modmenu:$project.modmenu_version") { exclude group: 'net.fabricmc.fabric-api' }) } diff --git a/gradle.properties b/gradle.properties index 7565f16..3761a8e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.16.4 - yarn_mappings=1.16.4+build.7 - loader_version=0.10.8 + minecraft_version=1.16.5 + yarn_mappings=1.16.5+build.3 + loader_version=0.11.1 # Mod Properties mod_version = 3.3.3 @@ -13,6 +13,6 @@ org.gradle.jvmargs=-Xmx1G archives_base_name = LibGui # Dependencies - fabric_version=0.28.3+1.16 + fabric_version=0.30.0+1.16 jankson_version=3.0.1+j1.2.0 - modmenu_version=1.14.6+build.31 + modmenu_version=1.14.15 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 290541c..28ff446 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/io/github/cottonmc/cotton/gui/client/modmenu/ModMenuSupport.java b/src/main/java/io/github/cottonmc/cotton/gui/client/modmenu/ModMenuSupport.java index e7c7ece..ccdff93 100644 --- a/src/main/java/io/github/cottonmc/cotton/gui/client/modmenu/ModMenuSupport.java +++ b/src/main/java/io/github/cottonmc/cotton/gui/client/modmenu/ModMenuSupport.java @@ -3,17 +3,10 @@ package io.github.cottonmc.cotton.gui.client.modmenu; import net.minecraft.text.TranslatableText; import io.github.cottonmc.cotton.gui.client.CottonClientScreen; -import io.github.cottonmc.cotton.gui.client.LibGuiClient; import io.github.prospector.modmenu.api.ConfigScreenFactory; import io.github.prospector.modmenu.api.ModMenuApi; public class ModMenuSupport implements ModMenuApi { - - @Override - public String getModId() { - return LibGuiClient.MODID; - } - @Override public ConfigScreenFactory<?> getModConfigScreenFactory() { return screen -> new CottonClientScreen(new TranslatableText("options.libgui.libgui_settings"), new ConfigGui(screen)) { |