From 4a9135fdf0b962df1a45d84b281d3aad3379bf84 Mon Sep 17 00:00:00 2001 From: Treetrain1 Date: Tue, 21 Nov 2023 18:51:47 -0600 Subject: [PATCH] fix shadow again --- build.gradle.kts | 4 +++- .../java/net/frozenblock/lib/config/api/instance/Config.java | 2 +- .../frozenblock/lib/config/api/instance/json/JsonConfig.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 75a1ec70e..3a948040e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -353,7 +353,9 @@ tasks { isEnableRelocation = true relocationPrefix = "net.frozenblock.lib.shadow" dependencies { - exclude(dependency("net.fabricmc:fabric-loader:.*")) + exclude { + it.moduleGroup.contains("fabric") + } } //relocate("blue.endless.jankson", "net.frozenblock.lib.config.api.jankson") diff --git a/src/main/java/net/frozenblock/lib/config/api/instance/Config.java b/src/main/java/net/frozenblock/lib/config/api/instance/Config.java index 4eddac06d..7855aad65 100644 --- a/src/main/java/net/frozenblock/lib/config/api/instance/Config.java +++ b/src/main/java/net/frozenblock/lib/config/api/instance/Config.java @@ -37,7 +37,7 @@ public abstract class Config { private T configInstance; private final T defaultInstance; - public Config(String modId, Class config, Path path, boolean supportsModification, @Nullable DataFixer dataFixer, @Nullable Integer version) { + protected Config(String modId, Class config, Path path, boolean supportsModification, @Nullable DataFixer dataFixer, @Nullable Integer version) { this.modId = modId; this.path = path; this.supportsModification = supportsModification; diff --git a/src/main/java/net/frozenblock/lib/config/api/instance/json/JsonConfig.java b/src/main/java/net/frozenblock/lib/config/api/instance/json/JsonConfig.java index f7513b104..0798eb9ee 100644 --- a/src/main/java/net/frozenblock/lib/config/api/instance/json/JsonConfig.java +++ b/src/main/java/net/frozenblock/lib/config/api/instance/json/JsonConfig.java @@ -93,7 +93,7 @@ public JsonConfig(String modId, Class config, Path path, JsonType type, boole public JsonConfig(String modId, Class config, Path path, JsonType type, boolean supportsModification, @Nullable DataFixer dataFixer, @Nullable Integer version) { super(modId, config, path, supportsModification, dataFixer, version); - var janksonBuilder = Jankson.builder().withFixer(dataFixer).version(version); + var janksonBuilder = Jankson.builder().withFixer(dataFixer).withVersion(version); this.jankson = ConfigSerialization.createJankson(janksonBuilder, modId); this.type = type;