[WIP] major rewrite, grass and leaves working already

src/main/kotlin/mods/betterfoliage/config/Config.kt

@@ -5,9 +5,17 @@ import mods.betterfoliage.BetterFoliageMod
 import net.minecraft.util.ResourceLocation
 import net.minecraftforge.eventbus.api.SubscribeEvent
 import net.minecraftforge.fml.config.ModConfig
+import java.util.Random
 
 private fun featureEnable() = boolean(true).lang("enabled")
 
+abstract class PopulationConfigCategory() : ConfigCategory() {
+    abstract val enabled: Boolean
+    abstract val population: Int
+
+    fun enabled(random: Random) = random.nextInt(64) < population && enabled
+}
+
 // Config singleton
 object Config : DelegatingConfig(BetterFoliageMod.MOD_ID, BetterFoliageMod.MOD_ID) {
 
@@ -24,22 +32,22 @@ object Config : DelegatingConfig(BetterFoliageMod.MOD_ID, BetterFoliageMod.MOD_I
         val hideInternal by boolean(true)
     }
 
-    object shortGrass : ConfigCategory(){
-        val grassEnabled by boolean(true)
+    object shortGrass : PopulationConfigCategory(){
+        override val enabled by featureEnable()
         val myceliumEnabled by boolean(true)
         val snowEnabled by boolean(true)
         val hOffset by double(max=0.4, default=0.2).lang("hOffset")
         val heightMin by double(min=0.1, max=2.5, default=0.6).lang("heightMin")
         val heightMax by double(min=0.1, max=2.5, default=0.8).lang("heightMax")
         val size by double(min=0.5, max=1.5, default=1.0).lang("size")
-        val population by int(max=64, default=64).lang("population")
+        override val population by int(max=64, default=64).lang("population")
         val useGenerated by boolean(false)
         val shaderWind by boolean(true).lang("shaderWind")
         val saturationThreshold by double(default=0.1)
     }
 
     object connectedGrass : ConfigCategory(){
-        val enabled by boolean(true)
+        val enabled by featureEnable()
         val snowEnabled by boolean(false)
     }
 
@@ -63,44 +71,44 @@ object Config : DelegatingConfig(BetterFoliageMod.MOD_ID, BetterFoliageMod.MOD_I
         val hOffset by double(max=0.5, default=0.1).lang("hOffset")
     }
 
-    object lilypad : ConfigCategory(){
-        val enabled by featureEnable()
+    object lilypad : PopulationConfigCategory(){
+        override val enabled by featureEnable()
         val hOffset by double(max=0.25, default=0.1).lang("hOffset")
-        val flowerChance by int(max=64, default=16, min=0)
+        override val population by int(max=64, default=16, min=0)
     }
 
-    object reed : ConfigCategory(){
-        val enabled by featureEnable()
+    object reed : PopulationConfigCategory(){
+        override val enabled by featureEnable()
         val hOffset by double(max=0.4, default=0.2).lang("hOffset")
         val heightMin by double(min=1.5, max=3.5, default=1.7).lang("heightMin")
         val heightMax by double(min=1.5, max=3.5, default=2.2).lang("heightMax")
-        val population by int(max=64, default=32).lang("population")
+        override val population by int(max=64, default=32).lang("population")
         val minBiomeTemp by double(default=0.4)
         val minBiomeRainfall by double(default=0.4)
 //        val biomes by biomeList { it.filterTemp(0.4f, null) && it.filterRain(0.4f, null) }
         val shaderWind by boolean(true).lang("shaderWind")
     }
 
-    object algae : ConfigCategory(){
-        val enabled by featureEnable()
+    object algae : PopulationConfigCategory(){
+        override val enabled by featureEnable()
         val hOffset by double(max=0.25, default=0.1).lang("hOffset")
         val size by double(min=0.5, max=1.5, default=1.0).lang("size")
         val heightMin by double(min=0.1, max=1.5, default=0.5).lang("heightMin")
         val heightMax by double(min=0.1, max=1.5, default=1.0).lang("heightMax")
-        val population by int(max=64, default=48).lang("population")
+        override val population by int(max=64, default=48).lang("population")
 //        val biomes by biomeList { it.filterClass("river", "ocean") }
         val shaderWind by boolean(true).lang("shaderWind")
     }
 
-    object coral : ConfigCategory(){
-        val enabled by featureEnable()
+    object coral : PopulationConfigCategory(){
+        override val enabled by featureEnable()
         val shallowWater by boolean(false)
         val hOffset by double(max=0.4, default=0.2).lang("hOffset")
         val vOffset by double(max=0.4, default=0.1).lang("vOffset")
         val size by double(min=0.5, max=1.5, default=0.7).lang("size")
         val crustSize by double(min=0.5, max=1.5, default=1.4)
         val chance by int(max=64, default=32)
-        val population by int(max=64, default=48).lang("population")
+        override val population by int(max=64, default=48).lang("population")
 //        val biomes by biomeList { it.filterClass("river", "ocean", "beach") }
     }
 
@@ -154,8 +162,8 @@ object BlockConfig {
     val lilypad = blocks("lilypad_default.cfg")
 
     init { BetterFoliageMod.bus.register(this) }
-    private fun blocks(cfgName: String) = ConfigurableBlockMatcher(BetterFoliage.logDetail, ResourceLocation(BetterFoliageMod.MOD_ID, cfgName)).apply { list.add(this) }
-    private fun models(cfgName: String) = ModelTextureListConfiguration(BetterFoliage.logDetail, ResourceLocation(BetterFoliageMod.MOD_ID, cfgName)).apply { list.add(this) }
+    private fun blocks(cfgName: String) = ConfigurableBlockMatcher(ResourceLocation(BetterFoliageMod.MOD_ID, cfgName)).apply { list.add(this) }
+    private fun models(cfgName: String) = ModelTextureListConfiguration(ResourceLocation(BetterFoliageMod.MOD_ID, cfgName)).apply { list.add(this) }
 
     @SubscribeEvent
     fun onConfig(event: ModConfig.ModConfigEvent) {