diff --git a/build.gradle b/build.gradle index f0194327..3ce857d8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java-library' - id 'fabric-loom' version '0.4-SNAPSHOT' + id 'fabric-loom' version '0.5-SNAPSHOT' id 'maven-publish' } @@ -25,6 +25,9 @@ repositories { maven { url = uri("https://jitpack.io") } + maven { + url = "https://maven.shedaniel.me/" + } } dependencies { @@ -35,17 +38,13 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + modImplementation "io.github.prospector:modmenu:${project.mod_menu_version}" - modImplementation ("me.shedaniel.cloth:config-2:${project.cloth_config_version}") { - transitive = false + modApi("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") { + exclude(group: "net.fabricmc.fabric-api") } - include "me.shedaniel.cloth:config-2:${project.cloth_config_version}" - - modImplementation "me.sargunvohra.mcmods:autoconfig1u:${project.auto_config_version}" - include "me.sargunvohra.mcmods:autoconfig1u:${project.auto_config_version}" - compile 'com.google.code.findbugs:jsr305:3.0.2' testCompile "junit:junit:4.+" } diff --git a/gradle.properties b/gradle.properties index dfc17ac3..1eff817a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties minecraft_version = 1.16.5 -yarn_mappings = 1.16.5+build.1 +yarn_mappings = 1.16.5+build.4 loader_version = 0.11.1 # Mod Properties @@ -12,7 +12,6 @@ maven_group = hunternif.mc.atlas archives_base_name = antiqueatlas # Dependencies -cloth_config_version = 4.8.3 -auto_config_version = 3.3.1 -fabric_version = 0.29.3+1.16 +cloth_config_version = 4.11.14 +fabric_version = 0.30.3+1.16 mod_menu_version = 1.14.13+build.22 diff --git a/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasConfig.java b/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasConfig.java index b50dae9a..bb6a676e 100644 --- a/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasConfig.java +++ b/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasConfig.java @@ -1,10 +1,10 @@ package hunternif.mc.impl.atlas; import hunternif.mc.impl.atlas.client.gui.GuiAtlas; -import me.sargunvohra.mcmods.autoconfig1u.ConfigData; -import me.sargunvohra.mcmods.autoconfig1u.annotation.Config; -import me.sargunvohra.mcmods.autoconfig1u.annotation.ConfigEntry; -import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.Comment; +import me.shedaniel.autoconfig.ConfigData; +import me.shedaniel.autoconfig.annotation.Config; +import me.shedaniel.autoconfig.annotation.ConfigEntry; +import me.shedaniel.cloth.clothconfig.shadowed.blue.endless.jankson.Comment; @Config(name = "antiqueatlas") public class AntiqueAtlasConfig implements ConfigData { diff --git a/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasMod.java b/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasMod.java index e5b5a45a..fb57fb9c 100644 --- a/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasMod.java +++ b/src/main/java/hunternif/mc/impl/atlas/AntiqueAtlasMod.java @@ -13,8 +13,8 @@ import hunternif.mc.impl.atlas.mixinhooks.NewServerConnectionCallback; import hunternif.mc.impl.atlas.network.AntiqueAtlasNetworking; import hunternif.mc.impl.atlas.structure.*; -import me.sargunvohra.mcmods.autoconfig1u.AutoConfig; -import me.sargunvohra.mcmods.autoconfig1u.serializer.JanksonConfigSerializer; +import me.shedaniel.autoconfig.AutoConfig; +import me.shedaniel.autoconfig.serializer.JanksonConfigSerializer; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents; import net.minecraft.server.world.ServerWorld; diff --git a/src/main/java/hunternif/mc/impl/atlas/client/gui/AntiqueAtlasModMenu.java b/src/main/java/hunternif/mc/impl/atlas/client/gui/AntiqueAtlasModMenu.java index e2272a00..fb37faf5 100644 --- a/src/main/java/hunternif/mc/impl/atlas/client/gui/AntiqueAtlasModMenu.java +++ b/src/main/java/hunternif/mc/impl/atlas/client/gui/AntiqueAtlasModMenu.java @@ -3,7 +3,7 @@ import hunternif.mc.impl.atlas.AntiqueAtlasConfig; import io.github.prospector.modmenu.api.ConfigScreenFactory; import io.github.prospector.modmenu.api.ModMenuApi; -import me.sargunvohra.mcmods.autoconfig1u.AutoConfig; +import me.shedaniel.autoconfig.AutoConfig; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment;