[WIP] finishing touches

+bunch of renames to bring the 2 version closer

src/main/kotlin/mods/betterfoliage/resource/discovery/BakingLifecycle.kt

@@ -1,17 +1,15 @@
 package mods.betterfoliage.resource.discovery
 
-import mods.betterfoliage.model.SpecialRenderVariantList
+import mods.betterfoliage.BetterFoliage
 import mods.betterfoliage.util.Atlas
 import mods.betterfoliage.util.HasLogger
 import mods.betterfoliage.util.Invalidator
-import mods.betterfoliage.util.SimpleInvalidator
 import net.minecraft.block.BlockState
 import net.minecraft.client.renderer.model.IBakedModel
 import net.minecraft.client.renderer.model.IModelTransform
 import net.minecraft.client.renderer.model.IUnbakedModel
 import net.minecraft.client.renderer.model.Material
 import net.minecraft.client.renderer.model.ModelBakery
-import net.minecraft.client.renderer.model.VariantList
 import net.minecraft.client.renderer.texture.TextureAtlasSprite
 import net.minecraft.util.ResourceLocation
 import net.minecraftforge.client.event.ModelBakeEvent
@@ -20,8 +18,8 @@ import net.minecraftforge.eventbus.api.Event
 import net.minecraftforge.eventbus.api.EventPriority
 import net.minecraftforge.eventbus.api.SubscribeEvent
 import net.minecraftforge.fml.loading.progress.StartupMessageManager
-import org.apache.logging.log4j.Level.DEBUG
 import org.apache.logging.log4j.Level.INFO
+import org.apache.logging.log4j.Level.WARN
 import org.apache.logging.log4j.Logger
 import java.lang.ref.WeakReference
 import java.util.function.Function
@@ -30,6 +28,19 @@ data class ModelDefinitionsLoadedEvent(
     val bakery: ModelBakery
 ) : Event()
 
+interface ModelBakingKey {
+    fun bake(ctx: ModelBakingContext): IBakedModel? =
+        ctx.getUnbaked().bakeModel(ctx.bakery, ctx.spriteGetter, ctx.transform, ctx.location)
+}
+
+interface ModelDiscovery {
+    fun onModelsLoaded(
+        bakery: ModelBakery,
+        sprites: MutableSet<ResourceLocation>,
+        replacements: MutableMap<ResourceLocation, ModelBakingKey>
+    )
+}
+
 data class ModelDiscoveryContext(
     val bakery: ModelBakery,
     val blockState: BlockState,
@@ -39,20 +50,13 @@ data class ModelDiscoveryContext(
     val logger: Logger
 ) {
     fun getUnbaked(location: ResourceLocation = modelLocation) = bakery.getUnbakedModel(location)
-    fun addReplacement(key: ModelBakingKey) {
+    fun addReplacement(key: ModelBakingKey, addToStateKeys: Boolean = true) {
         replacements[modelLocation] = key
+        if (addToStateKeys) BetterFoliage.blockTypes.stateKeys[blockState] = key
         logger.log(INFO, "Adding model replacement $modelLocation -> $key")
     }
 }
 
-interface ModelDiscovery {
-    fun onModelsLoaded(
-        bakery: ModelBakery,
-        sprites: MutableSet<ResourceLocation>,
-        replacements: MutableMap<ResourceLocation, ModelBakingKey>
-    )
-}
-
 data class ModelBakingContext(
     val bakery: ModelBakery,
     val spriteGetter: Function<Material, TextureAtlasSprite>,
@@ -64,31 +68,26 @@ data class ModelBakingContext(
     fun getBaked() = bakery.getBakedModel(location, transform, spriteGetter)
 }
 
-interface ModelBakingKey {
-    fun bake(ctx: ModelBakingContext): IBakedModel? =
-        ctx.getUnbaked().bakeModel(ctx.bakery, ctx.spriteGetter, ctx.transform, ctx.location)
-}
-
 object BakeWrapperManager : Invalidator, HasLogger() {
     val discoverers = mutableListOf<ModelDiscovery>()
     override val callbacks = mutableListOf<WeakReference<()->Unit>>()
 
-    val modelsValid = SimpleInvalidator()
-    val spritesValid = SimpleInvalidator()
-
     private val replacements = mutableMapOf<ResourceLocation, ModelBakingKey>()
     private val sprites = mutableSetOf<ResourceLocation>()
 
     @SubscribeEvent(priority = EventPriority.LOWEST)
     fun handleModelLoad(event: ModelDefinitionsLoadedEvent) {
         val startTime = System.currentTimeMillis()
-        modelsValid.invalidate()
+        invalidate()
+        BetterFoliage.blockTypes = BlockTypeCache()
+
         StartupMessageManager.addModMessage("BetterFoliage: discovering models")
         logger.log(INFO, "starting model discovery (${discoverers.size} listeners)")
         discoverers.forEach { listener ->
             val replacementsLocal = mutableMapOf<ResourceLocation, ModelBakingKey>()
             listener.onModelsLoaded(event.bakery, sprites, replacements)
         }
+
         val elapsed = System.currentTimeMillis() - startTime
         logger.log(INFO, "finished model discovery in $elapsed ms, ${replacements.size} top-level replacements")
     }
@@ -97,7 +96,6 @@ object BakeWrapperManager : Invalidator, HasLogger() {
     fun handleStitch(event: TextureStitchEvent.Pre) {
         if (event.map.textureLocation == Atlas.BLOCKS.resourceId) {
             logger.log(INFO, "Adding ${sprites.size} sprites to block atlas")
-            spritesValid.invalidate()
             sprites.forEach { event.addSprite(it) }
             sprites.clear()
         }
@@ -119,7 +117,12 @@ object BakeWrapperManager : Invalidator, HasLogger() {
         // bake replacement if available
         replacements[location]?.let { replacement ->
             detailLogger.log(INFO, "Baking replacement for [${unbaked::class.java.simpleName}] $location -> $replacement")
-            return replacement.bake(ctx)
+            try {
+                return replacement.bake(ctx)
+            } catch (e: Exception) {
+                detailLogger.log(WARN, "Error while baking $replacement", e)
+                logger.log(WARN, "Error while baking $replacement", e)
+            }
         }
         return unbaked.bakeModel(bakery, spriteGetter, transform, location)
     }