diff --git a/build.gradle.kts b/build.gradle.kts index 76daf2d..ea08f13 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,15 +1,34 @@ -import io.gitlab.jfronny.scripts.* - plugins { - id("jfmod") version "1.3-SNAPSHOT" + id("jfmod") version "1.5-SNAPSHOT" +} + +allprojects { group = "io.gitlab.jfronny" } +base.archivesName = "modsmod" + +jfMod { + minecraftVersion = "1.20.2" + yarn("build.1") + loaderVersion = "0.14.22" + libJfVersion = "3.13.1" + + modrinth { + projectId = "modsmod" + requiredDependencies.add("libjf") + optionalDependencies.add("modmenu") + } + curseforge { + projectId = "405095" + requiredDependencies.add("libjf") + optionalDependencies.add("modmenu") + } } dependencies { - modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${prop("libjf_version")}") - modImplementation("io.gitlab.jfronny.libjf:libjf-unsafe-v0:${prop("libjf_version")}") + modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2:${jfMod.libJfVersion.get()}") + modImplementation("io.gitlab.jfronny.libjf:libjf-unsafe-v0:${jfMod.libJfVersion.get()}") // Dev env - modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${prop("libjf_version")}") - modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${prop("libjf_version")}") - modLocalRuntime("com.terraformersmc:modmenu:7.0.1") + modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny:${jfMod.libJfVersion.get()}") + modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${jfMod.libJfVersion.get()}") + modLocalRuntime("com.terraformersmc:modmenu:8.0.0-beta.2") } diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index 37a0dfb..0000000 --- a/gradle.properties +++ /dev/null @@ -1,17 +0,0 @@ -# https://fabricmc.net/develop/ -minecraft_version=1.20 -yarn_mappings=build.1 -loader_version=0.14.21 - -maven_group=io.gitlab.jfronny -archives_base_name=modsmod - -modrinth_id=modsmod -modrinth_required_dependencies=libjf -modrinth_optional_dependencies=modmenu -curseforge_id=405095 -curseforge_required_dependencies=libjf -curseforge_optional_dependencies=modmenu - -libjf_version=3.8.0 -fabric_version=0.83.0+1.20 diff --git a/src/main/java/io/gitlab/jfronny/modsmod/FabricLoaderInterface.java b/src/main/java/io/gitlab/jfronny/modsmod/FabricLoaderInterface.java index 7e50529..02920f2 100644 --- a/src/main/java/io/gitlab/jfronny/modsmod/FabricLoaderInterface.java +++ b/src/main/java/io/gitlab/jfronny/modsmod/FabricLoaderInterface.java @@ -7,9 +7,7 @@ import net.fabricmc.loader.impl.ModContainerImpl; import net.fabricmc.loader.impl.discovery.ModCandidate; import net.fabricmc.loader.impl.metadata.LoaderModMetadata; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; +import java.lang.reflect.*; import java.nio.file.Path; import java.util.Collection; import java.util.List; diff --git a/src/main/java/io/gitlab/jfronny/modsmod/ModsMod.java b/src/main/java/io/gitlab/jfronny/modsmod/ModsMod.java index 7d11bec..0966b07 100644 --- a/src/main/java/io/gitlab/jfronny/modsmod/ModsMod.java +++ b/src/main/java/io/gitlab/jfronny/modsmod/ModsMod.java @@ -1,22 +1,19 @@ package io.gitlab.jfronny.modsmod; -import io.gitlab.jfronny.commons.log.*; +import io.gitlab.jfronny.commons.logging.Logger; import io.gitlab.jfronny.gson.Gson; -import io.gitlab.jfronny.libjf.config.api.v1.ConfigInstance; +import io.gitlab.jfronny.libjf.config.api.v2.ConfigInstance; import io.gitlab.jfronny.libjf.unsafe.UltraEarlyInit; import io.gitlab.jfronny.modsmod.builder.JsonBuilder; import io.gitlab.jfronny.modsmod.builder.ModMeta; import io.gitlab.jfronny.modsmod.util.IOUtil; -import net.fabricmc.loader.api.*; +import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.impl.FabricLoaderImpl; import net.fabricmc.loader.impl.metadata.*; import net.fabricmc.loader.impl.util.FileSystemUtil; import java.io.IOException; -import java.nio.file.FileSystem; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardCopyOption; +import java.nio.file.*; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/main/java/io/gitlab/jfronny/modsmod/ModsModConfig.java b/src/main/java/io/gitlab/jfronny/modsmod/ModsModConfig.java index e6a0e03..132eb1a 100644 --- a/src/main/java/io/gitlab/jfronny/modsmod/ModsModConfig.java +++ b/src/main/java/io/gitlab/jfronny/modsmod/ModsModConfig.java @@ -1,7 +1,7 @@ package io.gitlab.jfronny.modsmod; -import io.gitlab.jfronny.libjf.config.api.v1.JfConfig; -import io.gitlab.jfronny.libjf.config.api.v1.Entry; +import io.gitlab.jfronny.libjf.config.api.v2.Entry; +import io.gitlab.jfronny.libjf.config.api.v2.JfConfig; @JfConfig public class ModsModConfig {