Merge branch 'kotlin-1.9' into kotlin-1.9.4

This commit is contained in:
octarine-noise
2016-09-13 21:12:29 +02:00
4 changed files with 8 additions and 3 deletions

View File

@@ -2,7 +2,7 @@ apply plugin: "net.minecraftforge.gradle.forge"
apply plugin: 'kotlin' apply plugin: 'kotlin'
group = 'com.github.octarine-noise' group = 'com.github.octarine-noise'
version = "2.0.14" version = "2.0.15"
archivesBaseName = rootProject.name + '-MC1.9.4' archivesBaseName = rootProject.name + '-MC1.9.4'
buildscript { buildscript {

View File

@@ -39,7 +39,7 @@ object BetterFoliageMod {
@Mod.EventHandler @Mod.EventHandler
fun preInit(event: FMLPreInitializationEvent) { fun preInit(event: FMLPreInitializationEvent) {
log = event.modLog log = event.modLog
config = Configuration(event.suggestedConfigurationFile, null, false) config = Configuration(event.suggestedConfigurationFile, null, true)
} }

View File

@@ -56,6 +56,6 @@ abstract class IdListConfigEntry<T>(
} }
override fun getComment() = I18n.format("${configElement.languageKey}.tooltip.element", "${GOLD}${item.itemName}${YELLOW}") 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
} }
} }

View File

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