Update to LibJF 3

This commit is contained in:
Johannes Frohnmeyer 2022-08-28 16:47:28 +02:00
parent 1971508c43
commit 72ebde914e
Signed by: Johannes
GPG Key ID: E76429612C2929F4
5 changed files with 24 additions and 25 deletions

View File

@ -1,10 +1,12 @@
apply from: "https://jfmods.gitlab.io/scripts/jfmod.gradle" apply from: "https://jfmods.gitlab.io/scripts/gradle/v2.gradle"
dependencies { dependencies {
modImplementation("io.gitlab.jfronny.libjf:libjf-config-v0:${project.jfapi_version}") modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${project.libjf_version}")
modImplementation("io.gitlab.jfronny.libjf:libjf-unsafe-v0:${project.libjf_version}")
modImplementation "com.terraformersmc:modmenu:4.0.5" // Dev env
modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-reflect-v1:${project.libjf_version}")
// Compat fix modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${project.libjf_version}")
modImplementation(fabricApi.module("fabric-command-api-v2", "${project.fabric_version}")) modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${project.libjf_version}")
modLocalRuntime("com.terraformersmc:modmenu:4.0.6")
} }

View File

@ -1,13 +1,13 @@
# https://fabricmc.net/develop/ # https://fabricmc.net/develop/
minecraft_version=1.19.1 minecraft_version=1.19.2
yarn_mappings=build.1 yarn_mappings=build.8
loader_version=0.14.8 loader_version=0.14.9
# Mod Properties # Mod Properties
maven_group=io.gitlab.jfronny maven_group=io.gitlab.jfronny
archives_base_name=modsmod archives_base_name=modsmod
jfapi_version=2.10.0 libjf_version=3.0.3
fabric_version=0.58.5+1.19.1 fabric_version=0.60.0+1.19.2
modrinth_id=modsmod modrinth_id=modsmod
modrinth_required_dependencies=libjf modrinth_required_dependencies=libjf

View File

@ -2,8 +2,7 @@ package io.gitlab.jfronny.modsmod;
import io.gitlab.jfronny.commons.log.*; import io.gitlab.jfronny.commons.log.*;
import io.gitlab.jfronny.gson.Gson; import io.gitlab.jfronny.gson.Gson;
import io.gitlab.jfronny.libjf.config.api.ConfigInstance; import io.gitlab.jfronny.libjf.config.api.v1.ConfigInstance;
import io.gitlab.jfronny.libjf.config.impl.ConfigInstanceRoot;
import io.gitlab.jfronny.libjf.unsafe.UltraEarlyInit; import io.gitlab.jfronny.libjf.unsafe.UltraEarlyInit;
import io.gitlab.jfronny.modsmod.builder.JsonBuilder; import io.gitlab.jfronny.modsmod.builder.JsonBuilder;
import io.gitlab.jfronny.modsmod.builder.ModMeta; import io.gitlab.jfronny.modsmod.builder.ModMeta;
@ -33,7 +32,7 @@ public class ModsMod implements UltraEarlyInit {
public void init() { public void init() {
try { try {
//Load config //Load config
Path modsmodCfgFile = ((ConfigInstanceRoot)ConfigInstance.get(MOD_ID)).path; Path modsmodCfgFile = ConfigInstance.get(MOD_ID).getFilePath().orElseThrow();
//make sure the modsmodcache dir is ok //make sure the modsmodcache dir is ok
Path path = LOADER.getConfigDir().resolve(CACHE_NAME); Path path = LOADER.getConfigDir().resolve(CACHE_NAME);
if (!Files.isDirectory(path)) { if (!Files.isDirectory(path)) {

View File

@ -1,13 +1,11 @@
package io.gitlab.jfronny.modsmod; package io.gitlab.jfronny.modsmod;
import io.gitlab.jfronny.libjf.config.api.JfConfig; import io.gitlab.jfronny.libjf.config.api.v1.JfConfig;
import io.gitlab.jfronny.libjf.config.api.Entry; import io.gitlab.jfronny.libjf.config.api.v1.Entry;
public class ModsModConfig implements JfConfig { @JfConfig
@Entry public class ModsModConfig {
public static Boolean parent = false; @Entry public static boolean parent = false;
@Entry @Entry public static boolean cache = true;
public static Boolean cache = true; @Entry public static int modsCount = 26;
@Entry
public static Integer modsCount = 26;
} }

View File

@ -20,8 +20,8 @@
}, },
"depends": { "depends": {
"fabricloader": ">=0.13.3", "fabricloader": ">=0.13.3",
"libjf-config-v0": ">=2.5.0", "libjf-config-core-v1": ">=3.0.3",
"libjf-unsafe-v0": ">=2.5.0", "libjf-unsafe-v0": ">=3.0.3",
"minecraft": "*" "minecraft": "*"
} }
} }