From a4f247243190975c3ef2085e540fdff5619f40c8 Mon Sep 17 00:00:00 2001 From: JPAKx4 Date: Sun, 23 Aug 2026 13:06:38 -0500 Subject: [PATCH] Update Adorn minimum compatibility version to 6.3.1. --- .../common/mixin/invoker/AdornRegisterInvoker.java | 2 +- .../mod/common/integration/AdornCompatibility.kt | 14 ++++++-------- gradle/libs.versions.toml | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/common/src/main/java/com/cobblemon/mod/common/mixin/invoker/AdornRegisterInvoker.java b/common/src/main/java/com/cobblemon/mod/common/mixin/invoker/AdornRegisterInvoker.java index f3a8dbd970..51e61ab747 100644 --- a/common/src/main/java/com/cobblemon/mod/common/mixin/invoker/AdornRegisterInvoker.java +++ b/common/src/main/java/com/cobblemon/mod/common/mixin/invoker/AdornRegisterInvoker.java @@ -20,7 +20,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -//This is a yucky hack but better than what we were doing before +// There appears to be a data driven way to do this now, however I am not sure how it works since there is no wiki or anything so yolo @Mixin(BlockVariantSets.class) public abstract class AdornRegisterInvoker { @Final diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/integration/AdornCompatibility.kt b/common/src/main/kotlin/com/cobblemon/mod/common/integration/AdornCompatibility.kt index df50442ad3..86e21fca41 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/integration/AdornCompatibility.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/integration/AdornCompatibility.kt @@ -8,16 +8,14 @@ package com.cobblemon.mod.common.integration -import com.cobblemon.mod.common.Cobblemon import juuxel.adorn.block.variant.BlockVariant -import juuxel.adorn.block.variant.CompatBlockVariantSet +import juuxel.adorn.block.variant.BlockVariantSet -class AdornCompatibility : CompatBlockVariantSet() { +class AdornCompatibility: BlockVariantSet { override fun getWoodVariants(): List? { - return this.createVariants({ BlockVariant.Wood(it) }, "apricorn", "saccharine") - } - - override fun getModId(): String? { - return Cobblemon.MODID + val result: MutableList = mutableListOf() + result.add(BlockVariant.Wood("cobblemon/apricorn")) + result.add(BlockVariant.Wood("cobblemon/saccharine")) + return result } } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5bdd038588..b09eafc8cd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -81,7 +81,7 @@ fabric-loader = { group = "net.fabricmc", name = "fabric-loader", version.ref = fabric-api = { group = "net.fabricmc.fabric-api", name = "fabric-api", version.ref = "fabric-api" } fabric-kotlin = { group = "net.fabricmc", name = "fabric-language-kotlin", version.ref = "fabric-kotlin" } fabric-permissions = { group = "me.lucko", name = "fabric-permissions-api", version.ref = "fabric-permissions-api" } -adorn-fabric = { group = "maven.modrinth", name = "adorn", version = "6.0.0-neoforge"} +adorn-fabric = { group = "maven.modrinth", name = "adorn", version = "QbzMhTAO"} lambDynamicLights = { group = "dev.lambdaurora.lambdynamiclights", name = "lambdynamiclights-api", version.ref = "lambDynamicLights"} jei-fabric = { group = "mezz.jei", name = "jei-1.21.1-fabric", version.ref = "jei-api"} fabric-debugutils = { group = "maven.modrinth", name = "debugutils", version.ref = "debugutils-fabric"}