chore: update to 1.20.5
This commit is contained in:
parent
c008ce3868
commit
9bb5c4b87c
|
@ -1,15 +1,17 @@
|
|||
plugins {
|
||||
id("jfmod") version "1.5-SNAPSHOT"
|
||||
id("jfmod") version "1.6-SNAPSHOT"
|
||||
}
|
||||
|
||||
allprojects { group = "io.gitlab.jfronny" }
|
||||
base.archivesName = "modsmod"
|
||||
|
||||
val commonsVersion = "1.7-SNAPSHOT"
|
||||
jfMod {
|
||||
minecraftVersion = "1.20.4"
|
||||
minecraftVersion = "1.20.5"
|
||||
yarn("build.1")
|
||||
loaderVersion = "0.15.0"
|
||||
libJfVersion = "3.14.1"
|
||||
loaderVersion = "0.15.10"
|
||||
libJfVersion = "3.15.5"
|
||||
fabricApiVersion = "0.97.6+1.20.5"
|
||||
|
||||
modrinth {
|
||||
projectId = "modsmod"
|
||||
|
@ -24,11 +26,18 @@ jfMod {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2:${jfMod.libJfVersion.get()}")
|
||||
modImplementation("io.gitlab.jfronny.libjf:libjf-unsafe-v0:${jfMod.libJfVersion.get()}")
|
||||
modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2")
|
||||
modImplementation("io.gitlab.jfronny.libjf:libjf-unsafe-v0")
|
||||
|
||||
compileOnly("io.gitlab.jfronny:commons-serialize-generator-annotations:$commonsVersion")
|
||||
annotationProcessor("io.gitlab.jfronny:commons-serialize-generator:$commonsVersion")
|
||||
|
||||
// Dev env
|
||||
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:9.0.0-pre.1")
|
||||
modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny")
|
||||
modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil")
|
||||
modLocalRuntime("com.terraformersmc:modmenu:10.0.0-beta.1")
|
||||
// for modmenu
|
||||
modLocalRuntime("net.fabricmc.fabric-api:fabric-resource-loader-v0")
|
||||
modLocalRuntime("net.fabricmc.fabric-api:fabric-screen-api-v1")
|
||||
modLocalRuntime("net.fabricmc.fabric-api:fabric-key-binding-api-v1")
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package io.gitlab.jfronny.modsmod;
|
||||
|
||||
import io.gitlab.jfronny.gson.reflect.TypeToken;
|
||||
import io.gitlab.jfronny.commons.serialize.databind.api.TypeToken;
|
||||
import io.gitlab.jfronny.modsmod.util.IteratorCallbackList;
|
||||
import net.fabricmc.loader.impl.FabricLoaderImpl;
|
||||
import net.fabricmc.loader.impl.ModContainerImpl;
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
package io.gitlab.jfronny.modsmod;
|
||||
|
||||
import io.gitlab.jfronny.commons.logging.Logger;
|
||||
import io.gitlab.jfronny.gson.Gson;
|
||||
import io.gitlab.jfronny.commons.logger.SystemLoggerPlus;
|
||||
import io.gitlab.jfronny.libjf.config.api.v2.ConfigInstance;
|
||||
import io.gitlab.jfronny.libjf.unsafe.UltraEarlyInit;
|
||||
import io.gitlab.jfronny.modsmod.builder.JsonBuilder;
|
||||
|
@ -20,9 +19,8 @@ import java.util.HashSet;
|
|||
public class ModsMod implements UltraEarlyInit {
|
||||
static final HashSet<ModMeta> MODS = new HashSet<>();
|
||||
static final FabricLoaderImpl LOADER = FabricLoaderImpl.INSTANCE;
|
||||
public static final Gson GSON = new Gson();
|
||||
public static final String MOD_ID = "modsmod";
|
||||
public static final Logger LOGGER = Logger.forName(MOD_ID);
|
||||
public static final SystemLoggerPlus LOGGER = SystemLoggerPlus.forName(MOD_ID);
|
||||
private static final String CACHE_NAME = MOD_ID + "cache";
|
||||
|
||||
@Override
|
||||
|
|
|
@ -1,5 +1,8 @@
|
|||
package io.gitlab.jfronny.modsmod.builder;
|
||||
|
||||
import io.gitlab.jfronny.commons.serialize.generator.annotations.GPrefer;
|
||||
import io.gitlab.jfronny.commons.serialize.generator.annotations.GSerializable;
|
||||
import io.gitlab.jfronny.libjf.LibJf;
|
||||
import io.gitlab.jfronny.modsmod.ModsMod;
|
||||
|
||||
import java.io.BufferedWriter;
|
||||
|
@ -12,27 +15,21 @@ import java.util.Map;
|
|||
public class JsonBuilder {
|
||||
public static void build(int number, Path outputPath, boolean parent) throws IOException {
|
||||
try (BufferedWriter bw = Files.newBufferedWriter(outputPath)) {
|
||||
ModsMod.GSON.toJson(new ModManifest(number, parent), bw);
|
||||
GC_JsonBuilder.ModManifest.serialize(new ModManifest(number, parent), bw, LibJf.JSON_TRANSPORT);
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("unused")
|
||||
private static class ModManifest {
|
||||
public final int schemaVersion = 1;
|
||||
public final String id;
|
||||
public final String version = "1.0";
|
||||
public final String name;
|
||||
public final Map<String, ModMenuData> custom = new HashMap<>();
|
||||
@GSerializable
|
||||
public record ModManifest(int schemaVersion, String id, String version, String name, Map<String, ModMenuData> custom) {
|
||||
@GPrefer
|
||||
public ModManifest {
|
||||
}
|
||||
|
||||
public ModManifest(int number, boolean parent) {
|
||||
id = "modmod_" + number;
|
||||
name = "ModsMod " + number;
|
||||
if (parent)
|
||||
custom.put("modmenu", new ModMenuData());
|
||||
this(1, "modmod_" + number, "1.0", "ModsMod " + number, parent ? Map.of("modmenu", new ModMenuData("modsmod")) : Map.of());
|
||||
}
|
||||
|
||||
public static class ModMenuData {
|
||||
public final String parent = "modsmod";
|
||||
}
|
||||
@GSerializable
|
||||
public record ModMenuData(String parent) { }
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue