[WIP] finishing touches

+bunch of renames to bring the 2 version closer

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

@@ -42,7 +42,7 @@ abstract class AbstractModelDiscovery : HasLogger(), ModelDiscovery {
                 processModel(ctx.copy(modelLocation = variant.modelLocation, replacements = scopedReplacements))
             }
             if (scopedReplacements.isNotEmpty()) {
-                ctx.addReplacement(SpecialRenderVariantList(scopedReplacements))
+                ctx.addReplacement(WeightedUnbakedKey(scopedReplacements), addToStateKeys = false)
             }
         }
     }