diff --git a/build.gradle b/build.gradle index 37ce2fc..99dbdfb 100755 --- a/build.gradle +++ b/build.gradle @@ -14,8 +14,9 @@ minecraft { } repositories { - maven { url "https://maven.terraformersmc.com/releases" } - maven { url "https://jitpack.io" } + maven { + url = "https://api.modrinth.com/maven" + } } dependencies { @@ -25,8 +26,9 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - - modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}") + + modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}" + include "maven.modrinth:midnightlib:${project.midnightlib_version}" } processResources { diff --git a/gradle.properties b/gradle.properties index dffafbd..6caccbd 100755 --- a/gradle.properties +++ b/gradle.properties @@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.17-rc1 - yarn_mappings=1.17-rc1+build.5 - loader_version=0.11.3 + minecraft_version=1.17.1 + yarn_mappings=1.17.1+build.61 + loader_version=0.11.7 # Mod Properties - mod_version = 2.2.0 + mod_version = 2.3.0 maven_group = eu.midnightdust archives_base_name = cullleaves # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api - fabric_version=0.34.8+1.17 - mod_menu_version = 2.0.0-beta.7 + fabric_version=0.40.1+1.17 + midnightlib_version=0.2.5 diff --git a/src/main/java/eu/midnightdust/cullleaves/CullLeavesClient.java b/src/main/java/eu/midnightdust/cullleaves/CullLeavesClient.java index b37ea06..ced9206 100755 --- a/src/main/java/eu/midnightdust/cullleaves/CullLeavesClient.java +++ b/src/main/java/eu/midnightdust/cullleaves/CullLeavesClient.java @@ -14,7 +14,7 @@ public void onInitializeClient() { CullLeavesConfig.init("cullleaves", CullLeavesConfig.class); FabricLoader.getInstance().getModContainer("cullleaves").ifPresent(modContainer -> { - ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("cullleaves:smartleaves"), modContainer, ResourcePackActivationType.DEFAULT_ENABLED); + ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("cullleaves:smartleaves"), modContainer, ResourcePackActivationType.NORMAL); }); } } diff --git a/src/main/java/eu/midnightdust/cullleaves/config/ModMenuIntegration.java b/src/main/java/eu/midnightdust/cullleaves/config/ModMenuIntegration.java deleted file mode 100755 index e618204..0000000 --- a/src/main/java/eu/midnightdust/cullleaves/config/ModMenuIntegration.java +++ /dev/null @@ -1,15 +0,0 @@ -package eu.midnightdust.cullleaves.config; - -import io.github.prospector.modmenu.api.ConfigScreenFactory; -import io.github.prospector.modmenu.api.ModMenuApi; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; - -@Environment(EnvType.CLIENT) -public class ModMenuIntegration implements ModMenuApi { - - @Override - public ConfigScreenFactory getModConfigScreenFactory() { - return parent -> CullLeavesConfig.getScreen(parent, "cullleaves"); - } -} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 625b6d1..ddfe397 100755 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -22,9 +22,6 @@ "entrypoints": { "client": [ "eu.midnightdust.cullleaves.CullLeavesClient" - ], - "modmenu": [ - "eu.midnightdust.cullleaves.config.ModMenuIntegration" ] },