[WIP] algae, reeds, mycelium, coral working

+ lots of cleanup, reorganizing

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

@@ -1,12 +1,11 @@
 package mods.betterfoliage.resource.discovery
 
 import mods.betterfoliage.ModelDefinitionsLoadedEvent
-import mods.betterfoliage.render.bakeSpecial
+import mods.betterfoliage.model.SpecialRenderVariantList
 import mods.betterfoliage.util.Atlas
 import mods.betterfoliage.util.HasLogger
 import mods.betterfoliage.util.Invalidator
 import mods.betterfoliage.util.SimpleInvalidator
-import mods.betterfoliage.util.asBlockMaterial
 import net.minecraft.client.renderer.model.IBakedModel
 import net.minecraft.client.renderer.model.IModelTransform
 import net.minecraft.client.renderer.model.IUnbakedModel
@@ -17,11 +16,9 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite
 import net.minecraft.util.ResourceLocation
 import net.minecraftforge.client.event.ModelBakeEvent
 import net.minecraftforge.client.event.TextureStitchEvent
-import net.minecraftforge.common.ForgeConfig
 import net.minecraftforge.eventbus.api.SubscribeEvent
 import net.minecraftforge.fml.loading.progress.StartupMessageManager
 import org.apache.logging.log4j.Level.INFO
-import org.apache.logging.log4j.LogManager
 import java.lang.ref.WeakReference
 import java.util.function.Function
 
@@ -29,13 +26,12 @@ interface ModelDiscovery {
     fun onModelsLoaded(
         bakery: ModelBakery,
         sprites: MutableSet<ResourceLocation>,
-        replacements: MutableMap<ResourceLocation, ModelBakeKey>
+        replacements: MutableMap<ResourceLocation, ModelBakingKey>
     )
 }
 
-@FunctionalInterface
-interface ModelBakeKey {
-    fun replace(
+interface ModelBakingKey {
+    fun bake(
         location: ResourceLocation,
         unbaked: IUnbakedModel,
         transform: IModelTransform,
@@ -44,28 +40,6 @@ interface ModelBakeKey {
     ): IBakedModel? = unbaked.bakeModel(bakery, spriteGetter, transform, location)
 }
 
-interface ModelWrapperKey : ModelBakeKey {
-    override fun replace(
-        location: ResourceLocation,
-        unbaked: IUnbakedModel,
-        transform: IModelTransform,
-        bakery: ModelBakery,
-        spriteGetter: Function<Material, TextureAtlasSprite>
-    ): IBakedModel? {
-        val baked = super.replace(location, unbaked, transform, bakery, spriteGetter) ?: return null
-        val sprites = { res: ResourceLocation -> spriteGetter.apply(res.asBlockMaterial) }
-        return replace(location, baked, sprites)
-    }
-
-    fun replace(
-        location: ResourceLocation,
-        wrapped: IBakedModel,
-        sprites: (ResourceLocation) -> TextureAtlasSprite
-    ) = replace(wrapped)
-
-    fun replace(wrapped: IBakedModel) = wrapped
-}
-
 object BakeWrapperManager : Invalidator, HasLogger() {
     val discoverers = mutableListOf<ModelDiscovery>()
     override val callbacks = mutableListOf<WeakReference<()->Unit>>()
@@ -73,7 +47,7 @@ object BakeWrapperManager : Invalidator, HasLogger() {
     val modelsValid = SimpleInvalidator()
     val spritesValid = SimpleInvalidator()
 
-    private val replacements = mutableMapOf<ResourceLocation, ModelBakeKey>()
+    private val replacements = mutableMapOf<ResourceLocation, ModelBakingKey>()
     private val sprites = mutableSetOf<ResourceLocation>()
 
     @SubscribeEvent
@@ -82,7 +56,7 @@ object BakeWrapperManager : Invalidator, HasLogger() {
         StartupMessageManager.addModMessage("BetterFoliage: discovering models")
         logger.log(INFO, "starting model discovery (${discoverers.size} listeners)")
         discoverers.forEach { listener ->
-            val replacementsLocal = mutableMapOf<ResourceLocation, ModelBakeKey>()
+            val replacementsLocal = mutableMapOf<ResourceLocation, ModelBakingKey>()
             listener.onModelsLoaded(event.bakery, sprites, replacementsLocal)
             replacements.putAll(replacementsLocal)
         }
@@ -113,10 +87,10 @@ 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.replace(location, unbaked, transform, bakery, spriteGetter)
+            return replacement.bake(location, unbaked, transform, bakery, spriteGetter)
         }
         // container model support
-        if (unbaked is VariantList) unbaked.bakeSpecial(bakery, spriteGetter)?.let {
+        if (unbaked is VariantList) SpecialRenderVariantList.bakeIfSpecial(location, unbaked, bakery, spriteGetter)?.let {
             detailLogger.log(INFO, "Wrapping container [${unbaked::class.java.simpleName}] $location")
             return it
         }

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

@@ -11,7 +11,7 @@ class BlockTypeCache {
     val dirt = mutableSetOf<BlockState>()
 
     companion object : ModelDiscovery {
-        override fun onModelsLoaded(bakery: ModelBakery, sprites: MutableSet<ResourceLocation>, replacements: MutableMap<ResourceLocation, ModelBakeKey>
+        override fun onModelsLoaded(bakery: ModelBakery, sprites: MutableSet<ResourceLocation>, replacements: MutableMap<ResourceLocation, ModelBakingKey>
         ) {
             Client.blockTypes = BlockTypeCache()
         }

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

@@ -15,11 +15,11 @@ import net.minecraft.util.ResourceLocation
 import net.minecraftforge.registries.ForgeRegistries
 import org.apache.logging.log4j.Level
 
-abstract class ModelReplacer : HasLogger(), ModelDiscovery {
+abstract class AbstractModelDiscovery : HasLogger(), ModelDiscovery {
     override fun onModelsLoaded(
         bakery: ModelBakery,
         sprites: MutableSet<ResourceLocation>,
-        replacements: MutableMap<ResourceLocation, ModelBakeKey>
+        replacements: MutableMap<ResourceLocation, ModelBakingKey>
     ) {
         ForgeRegistries.BLOCKS
             .flatMap { block -> block.stateContainer.validStates }
@@ -38,7 +38,7 @@ abstract class ModelReplacer : HasLogger(), ModelDiscovery {
         state: BlockState,
         location: ResourceLocation,
         sprites: MutableSet<ResourceLocation>,
-        replacements: MutableMap<ResourceLocation, ModelBakeKey>
+        replacements: MutableMap<ResourceLocation, ModelBakingKey>
     ): Boolean {
         // built-in support for container models
         return when (val model = bakery.getUnbakedModel(location)) {
@@ -59,9 +59,7 @@ abstract class ModelReplacer : HasLogger(), ModelDiscovery {
     }
 }
 
-
-
-abstract class ConfigurableModelReplacer : ModelReplacer() {
+abstract class ConfigurableModelDiscovery : AbstractModelDiscovery() {
     abstract val matchClasses: IBlockMatcher
     abstract val modelTextures: List<ModelTextureList>
 
@@ -70,7 +68,7 @@ abstract class ConfigurableModelReplacer : ModelReplacer() {
         location: ResourceLocation,
         textureMatch: List<ResourceLocation>,
         sprites: MutableSet<ResourceLocation>,
-        replacements: MutableMap<ResourceLocation, ModelBakeKey>
+        replacements: MutableMap<ResourceLocation, ModelBakingKey>
     ): Boolean
 
     override fun processModel(
@@ -78,7 +76,7 @@ abstract class ConfigurableModelReplacer : ModelReplacer() {
         state: BlockState,
         location: ResourceLocation,
         sprites: MutableSet<ResourceLocation>,
-        replacements: MutableMap<ResourceLocation, ModelBakeKey>
+        replacements: MutableMap<ResourceLocation, ModelBakingKey>
     ): Boolean {
         val model = bakery.getUnbakedModel(location)
         if (model is BlockModel) {