Merge branch 'kotlin-1.9.4' into kotlin-1.10

build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin'
 
 group = 'com.github.octarine-noise'
 version = "2.1.1"
-archivesBaseName = rootProject.name + '-MC1.10.2'
+archivesBaseName = rootProject.name + '-MC1.10'
 
 buildscript {
     ext.kotlin_version = '1.0.3'

src/main/kotlin/mods/betterfoliage/BetterFoliageMod.kt

@@ -57,7 +57,7 @@ object BetterFoliageMod {
             PropertiesUtil(Properties()),
             PrintStream(File(event.modConfigurationDirectory.parentFile, "logs/betterfoliage.log"))
         )
-        config = Configuration(event.suggestedConfigurationFile, null, false)
+        config = Configuration(event.suggestedConfigurationFile, null, true)
     }
 
     @Mod.EventHandler

src/main/kotlin/mods/octarinecore/client/gui/IdListConfigEntry.kt

@@ -56,6 +56,6 @@ abstract class IdListConfigEntry<T>(
         }
 
         override fun getComment() = I18n.format("${configElement.languageKey}.tooltip.element", "${GOLD}${item.itemName}${YELLOW}")
-        val booleanValue: Boolean get() = value as Boolean
+        val booleanValue: Boolean get() = defaultValue as Boolean
     }
 }

src/main/kotlin/mods/octarinecore/common/config/DelegatingConfig.kt

@@ -63,6 +63,11 @@ abstract class DelegatingConfig(val modId: String, val langPrefix: String) {
             rootGuiElements.add(ConfigElement(configCategory))
         }
         save()
+
+        // hide all categories not in the config singleton
+        config.categoryNames.forEach {
+            config.getCategory(it).setShowInGui(it in subProperties.keySet())
+        }
     }
 
     /**