User: kyle wood Date: 08 Aug 26 03:16 Revision: 52b2f0be809a6d4c201f242ce5a1272e8cffbc4e Summary: Hide Yarn version selector for Fabric 26.1+ TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=10601&personal=false Index: src/main/kotlin/creator/custom/types/FabricVersionsCreatorProperty.kt =================================================================== --- src/main/kotlin/creator/custom/types/FabricVersionsCreatorProperty.kt (revision c0908cb848852942c919dcdfd356433032ba3f8b) +++ src/main/kotlin/creator/custom/types/FabricVersionsCreatorProperty.kt (revision 52b2f0be809a6d4c201f242ce5a1272e8cffbc4e) @@ -29,9 +29,11 @@ import com.demonwav.mcdev.creator.custom.model.FabricVersionsModel import com.demonwav.mcdev.platform.fabric.util.FabricApiVersions import com.demonwav.mcdev.platform.fabric.util.FabricVersions +import com.demonwav.mcdev.util.MinecraftVersions import com.demonwav.mcdev.util.SemanticVersion import com.demonwav.mcdev.util.asyncIO import com.intellij.openapi.observable.properties.GraphProperty +import com.intellij.openapi.observable.util.and import com.intellij.openapi.observable.util.bindBooleanStorage import com.intellij.openapi.observable.util.not import com.intellij.openapi.observable.util.transform @@ -88,6 +90,7 @@ val mcVersionString = mcVersion.toString() versions.mappings.any { it.gameVersion == mcVersionString } } + val usesMappingsProperty = mcVersionProperty.transform { it < MinecraftVersions.MC26_1 } val fabricApiVersionProperty = graphProperty.transform({ it.fabricApi }, { model.copy(fabricApi = it) }) val fabricApiVersionModel = DefaultComboBoxModel() @@ -183,7 +186,7 @@ .visibleIf(yarnHasMatchingGameVersion.not()) .component.foreground = JBColor.YELLOW }.enabled(descriptor.editable != false) - .visibleIf(!loadingVersionsProperty) + .visibleIf(!loadingVersionsProperty and usesMappingsProperty) panel.row(MCDevBundle("creator.ui.fabricapi_version.label")) { comboBox(fabricApiVersionModel)