From 776dadb050b4e7d76de9fa16161d2cda4dd66e5b Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sun, 3 Sep 2023 16:36:08 -0400 Subject: YACL Config --- build.gradle | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index 5f0d1822..576d544c 100644 --- a/build.gradle +++ b/build.gradle @@ -20,6 +20,7 @@ repositories { } maven { url "https://maven.terraformersmc.com/releases" } maven { url "https://maven.shedaniel.me/" } + maven { url "https://maven.isxander.dev/releases" } maven { url 'https://repo.maven.apache.org/maven2' name 'Maven Central' @@ -30,7 +31,8 @@ repositories { } maven { url "https://repo.codemc.io/repository/maven-public/" } // For Occlusion Culling library maven { url "https://repo.nea.moe/releases" } // For neu repoparser - maven { url "https://jitpack.io" } + maven { url "https://oss.sonatype.org/content/repositories/snapshots" } + maven {url "https://jitpack.io"} } dependencies { @@ -44,11 +46,8 @@ dependencies { // Fabric API modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}" - // Cloth config - include modImplementation("me.shedaniel.cloth:cloth-config-fabric:${project.clothconfig_version}") { - exclude group: "net.fabricmc.fabric-api" - exclude module: "modmenu" - } + // YACL + include modImplementation("dev.isxander.yacl:yet-another-config-lib-fabric:${project.yacl_version}") // Mod Menu modImplementation "com.terraformersmc:modmenu:${project.mod_menu_version}" -- cgit From 7ff019278797431a9b9731834463497f1a33d5b6 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sun, 24 Sep 2023 14:12:29 -0400 Subject: YACL 3.2.0 (+1.20.2 Support) --- build.gradle | 3 ++- gradle.properties | 2 +- src/main/java/me/xmrvizzy/skyblocker/config/ConfigModel.java | 1 + .../java/me/xmrvizzy/skyblocker/config/ConfigSerializer.java | 9 +++++++-- src/main/java/me/xmrvizzy/skyblocker/config/ConfigUtils.java | 2 +- .../java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 8 ++++++++ .../me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java | 1 + src/main/resources/fabric.mod.json | 2 +- 8 files changed, 22 insertions(+), 6 deletions(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index 576d544c..8b2140f4 100644 --- a/build.gradle +++ b/build.gradle @@ -31,7 +31,8 @@ repositories { } maven { url "https://repo.codemc.io/repository/maven-public/" } // For Occlusion Culling library maven { url "https://repo.nea.moe/releases" } // For neu repoparser - maven { url "https://oss.sonatype.org/content/repositories/snapshots" } + maven { url "https://oss.sonatype.org/content/repositories/snapshots" } //For YACL + maven { url "https://maven.quiltmc.org/repository/release" } //For YACL maven {url "https://jitpack.io"} } diff --git a/gradle.properties b/gradle.properties index f15f8c90..4e236fb1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ fabric_api_version=0.89.1+1.20.2 # Dependencies ## YACL (https://github.com/isXander/YetAnotherConfigLib) -yacl_version=3.1.1+1.20 +yacl_version=3.2.0+1.20.2 ## Mod Menu (https://modrinth.com/mod/modmenu/versions) mod_menu_version=8.0.0-beta.2 ## REI (https://modrinth.com/mod/rei/versions?l=fabric) diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/ConfigModel.java b/src/main/java/me/xmrvizzy/skyblocker/config/ConfigModel.java index a4b8d1b0..a8f27a35 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/ConfigModel.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/ConfigModel.java @@ -14,6 +14,7 @@ import net.minecraft.client.resource.language.I18n; import net.minecraft.text.Text; import net.minecraft.util.Formatting; +@SuppressWarnings("deprecation") public class ConfigModel { @ConfigEntry public int version = 1; diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/ConfigSerializer.java b/src/main/java/me/xmrvizzy/skyblocker/config/ConfigSerializer.java index 8aaa7d2d..2d63fc76 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/ConfigSerializer.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/ConfigSerializer.java @@ -6,18 +6,23 @@ import com.google.gson.FieldNamingPolicy; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import dev.isxander.yacl3.config.GsonConfigInstance.ColorTypeAdapter; +import dev.isxander.yacl3.config.v2.impl.serializer.GsonConfigSerializer; +import net.minecraft.item.Item; import net.minecraft.text.Style; import net.minecraft.text.Text; import net.minecraft.util.Identifier; +/** + * Note: The type hierarchy adapters are copied from YACL's code + */ class ConfigSerializer { static final Gson INSTANCE = new GsonBuilder() .setFieldNamingPolicy(FieldNamingPolicy.IDENTITY) .registerTypeHierarchyAdapter(Text.class, new Text.Serializer()) .registerTypeHierarchyAdapter(Style.class, new Style.Serializer()) .registerTypeHierarchyAdapter(Identifier.class, new Identifier.Serializer()) - .registerTypeHierarchyAdapter(Color.class, new ColorTypeAdapter()) + .registerTypeHierarchyAdapter(Color.class, new GsonConfigSerializer.ColorTypeAdapter()) + .registerTypeHierarchyAdapter(Item.class, new GsonConfigSerializer.ItemTypeAdapter()) .serializeNulls() .setPrettyPrinting() .create(); diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/ConfigUtils.java b/src/main/java/me/xmrvizzy/skyblocker/config/ConfigUtils.java index 57ea5893..f5605342 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/ConfigUtils.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/ConfigUtils.java @@ -10,6 +10,6 @@ public class ConfigUtils { public static > CyclingListControllerBuilder createCyclingListController4Enum(Option opt) { E[] constants = (E[]) opt.binding().defaultValue().getClass().getEnumConstants(); - return CyclingListControllerBuilder.create(opt).values(constants).valueFormatter(c -> Text.of(c.toString())); + return CyclingListControllerBuilder.create(opt).values(constants).formatValue(formatter -> Text.of(formatter.toString())); } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index 12007671..9020d7a0 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -23,12 +23,20 @@ import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.gui.screen.Screen; import net.minecraft.text.Text; +@SuppressWarnings("deprecation") public class SkyblockerConfig { private static final Path PATH = FabricLoader.getInstance().getConfigDir().resolve("skyblocker.json"); private static final GsonConfigInstance INSTANCE = GsonConfigInstance.createBuilder(ConfigModel.class) .setPath(PATH) .overrideGsonBuilder(ConfigSerializer.INSTANCE) .build(); + /*private static final ConfigClassHandler HANDLER = ConfigClassHandler.createBuilder(ConfigModel.class) + .serializer(config -> GsonConfigSerializerBuilder.create(config) + .setPath(PATH) + .setJson5(false) + .overrideGsonBuilder(ConfigSerializer.INSTANCE) + .build()) + .build();*/ public static ConfigModel get() { return INSTANCE.getConfig(); diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java index 97861e93..443ad509 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java @@ -140,6 +140,7 @@ public class CustomArmorTrims { return Command.SINGLE_SUCCESS; } + @SuppressWarnings("deprecation") public record ArmorTrimId(@ConfigEntry Identifier material, @ConfigEntry Identifier pattern) implements Pair { @Override public Identifier left() { diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 5ccf35c3..0920d7d7 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -38,7 +38,7 @@ "depends": { "fabricloader": ">=0.14.22", "fabric-api": ">=0.89.1+1.20.2", - "yet_another_config_lib_v3": ">=3.1.0+1.20", + "yet_another_config_lib_v3": ">=3.2.0+1.20.2", "minecraft": "~1.20.2" }, "conflicts": { -- cgit From e64e67b45467977028afe27ff0c148c4caf77a58 Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Wed, 27 Sep 2023 22:27:37 -0400 Subject: Bump dependencies and remove emi from runtime --- build.gradle | 2 +- gradle.properties | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index 8b2140f4..d26c0e92 100644 --- a/build.gradle +++ b/build.gradle @@ -59,7 +59,7 @@ dependencies { // EMI modCompileOnly "dev.emi:emi-fabric:${project.emi_version}:api" - modLocalRuntime "dev.emi:emi-fabric:${project.emi_version}" +// modLocalRuntime "dev.emi:emi-fabric:${project.emi_version}" TODO uncomment when EMI is updated // Renderer (https://github.com/0x3C50/Renderer) include modImplementation("com.github.0x3C50:Renderer:${project.renderer_version}") { diff --git a/gradle.properties b/gradle.properties index 4e236fb1..3c2a112b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,16 +15,16 @@ fabric_api_version=0.89.1+1.20.2 ## YACL (https://github.com/isXander/YetAnotherConfigLib) yacl_version=3.2.0+1.20.2 ## Mod Menu (https://modrinth.com/mod/modmenu/versions) -mod_menu_version=8.0.0-beta.2 +mod_menu_version = 8.0.0 ## REI (https://modrinth.com/mod/rei/versions?l=fabric) -rei_version=12.0.625 +rei_version = 13.0.661 ## EMI (https://modrinth.com/mod/emi/versions) emi_version = 1.0.19+1.20.1 ## Renderer (https://github.com/0x3C50/Renderer) renderer_version = master-SNAPSHOT ## Mixin Extras (https://github.com/LlamaLad7/MixinExtras) -mixin_extras_version=0.2.0-beta.9 +mixin_extras_version = 0.2.0-rc.5 ## Better Inject (https://github.com/caoimhebyrne/BetterInject) betterinject_version=0.1.3 ## Occlusion Culling (https://github.com/LogisticsCraft/OcclusionCulling) -- cgit