Merge branch 'evo-tree-pls-behave' into 'main'

Evo tree small adjustments

See merge request cable-mc/cobblemon!2479

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/entry/DexEntries.kt

@@ -93,9 +93,6 @@ object DexEntries : JsonDataRegistry<PokedexEntry> {
                     ?.let { PokemonSpecies.getByIdentifier(it.asIdentifierDefaultingNamespace()) }
                     ?: return@resultLoop
 
-                if (!resultSpecies.implemented)
-                    return@resultLoop
-
                 // Carry the source form's aspects over like a real evolution does (Alola-Bias Pichu -> Alola-Bias Pikachu)
                 val resultForm = resultSpecies.getForm(form.aspects.toSet() + resultProperties.aspects)
                 val toAspects = resultProperties.aspects + resultForm.aspects

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/entry/DexEvolutionDisplay.kt

@@ -414,7 +414,7 @@ fun buildStructureRequirement(structureRequirement: StructureRequirement, negate
         return null
     }
 
-    val icon = Items.STRUCTURE_BLOCK
+    val icon = Items.FILLED_MAP
     val displayName: (RegistryLikeCondition<Structure>) -> MutableComponent = {
         when (it) {
             is RegistryLikeTagCondition -> tagDisplayName("worldgen.structure", it.tag.location())

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pokedex/PokedexGUI.kt

@@ -192,6 +192,7 @@ class PokedexGUI private constructor(
     public override fun init() {
         super.init()
         clearWidgets()
+        evolutionTreeExpanded = false
 
         availableRegions = Dexes.dexEntryMap.keys.toList()
         selectedRegionIndex = 0

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pokedex/widgets/EvolutionTreeWidget.kt

@@ -16,6 +16,7 @@ import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
 import com.cobblemon.mod.common.api.pokedex.entry.CobblemonBiomeDexEvolutionRequirementDisplay
 import com.cobblemon.mod.common.api.pokedex.entry.DexEntries
 import com.cobblemon.mod.common.api.pokedex.entry.DexEvolutionDisplay
+import com.cobblemon.mod.common.api.pokedex.entry.DexEvolutionRequirementDisplay
 import com.cobblemon.mod.common.api.pokedex.entry.PokedexEntry
 import com.cobblemon.mod.common.api.pokedex.entry.PokedexForm
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
@@ -46,6 +47,7 @@ import com.cobblemon.mod.common.util.lang
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.core.registries.Registries
+import net.minecraft.locale.Language
 import net.minecraft.network.chat.Component
 import net.minecraft.network.chat.MutableComponent
 import net.minecraft.tags.TagKey
@@ -110,11 +112,14 @@ class EvolutionTreeWidget(
         resource = expandResource,
         clickAction = {
             parent.evolutionTreeExpanded = !parent.evolutionTreeExpanded
-            expandButton.resource = if (parent.evolutionTreeExpanded) minimizeResource else expandResource
             updatePositioning()
         }
     ).apply { addWidget(this) }
 
+    init {
+        updatePositioning()
+    }
+
     override fun renderWidget(
         guiGraphics: GuiGraphics,
         mouseX: Int,
@@ -216,6 +221,7 @@ class EvolutionTreeWidget(
         panningX = 0.0
         panningY = 0.0
 
+        expandButton.resource = if (parent.evolutionTreeExpanded) minimizeResource else expandResource
         expandButton.buttonX = x + EXPAND_BUTTON_X_MARGIN
         expandButton.buttonY = y + EXPAND_BUTTON_Y_MARGIN
     }
@@ -448,10 +454,10 @@ class EvolutionTreeWidget(
         mouseY: Int,
         delta: Float,
     ) {
-        val icons = renderDataAlternatives.flatMap { it.requirements.map { req -> req.icon } }.distinct()
+        val icons = renderDataAlternatives.flatMap { it.requirements.filter(::isDisplayable).map { req -> req.icon } }.distinct()
         val playerBiome = Minecraft.getInstance().player?.let { it.level().getBiome(it.blockPosition()) }
         val alternativeTooltips = renderDataAlternatives.map { alternative ->
-            alternative.requirements.map { req ->
+            alternative.requirements.filter(::isDisplayable).map { req ->
                 if (req is CobblemonBiomeDexEvolutionRequirementDisplay) {
                     val tooltip = req.tooltip.copy()
                     if (playerBiome != null) {
@@ -544,6 +550,14 @@ class EvolutionTreeWidget(
         }
     }
 
+    /** Hides biome requirements naming untranslated biomes, e.g. from mods that aren't installed (aether:skyroot_forest) */
+    private fun isDisplayable(requirement: DexEvolutionRequirementDisplay): Boolean {
+        if (requirement !is CobblemonBiomeDexEvolutionRequirementDisplay) return true
+        return listOfNotNull(requirement.condition, requirement.antiCondition).all {
+            it.tag || Language.getInstance().has("biome.${it.id.namespace}.${it.id.path}")
+        }
+    }
+
     private fun combineAlternativeTooltips(alternatives: List<List<Component>>): List<Component> {
         val groups = alternatives.filter { it.isNotEmpty() }
         if (groups.size <= 1) return groups.firstOrNull() ?: emptyList()

common/src/main/resources/data/cobblemon/species/generation4/abomasnow.json

@@ -1,4 +1,5 @@
 {
+  "implemented": true,
   "nationalPokedexNumber": 460,
   "name": "Abomasnow",
   "primaryType": "grass",

common/src/main/resources/data/cobblemon/species/generation4/snover.json

@@ -1,4 +1,5 @@
 {
+  "implemented": true,
   "nationalPokedexNumber": 459,
   "name": "Snover",
   "primaryType": "grass",