Merge branch 'kotlin-1.10' into kotlin-1.11.2

This commit is contained in:
octarine-noise
2017-09-10 01:13:41 +02:00
2 changed files with 6 additions and 7 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.1.8" version = "2.1.10"
archivesBaseName = rootProject.name + '-MC1.11.2' archivesBaseName = rootProject.name + '-MC1.11.2'
buildscript { buildscript {

View File

@@ -22,7 +22,8 @@ import java.util.*
modid = BetterFoliageMod.MOD_ID, modid = BetterFoliageMod.MOD_ID,
name = BetterFoliageMod.MOD_NAME, name = BetterFoliageMod.MOD_NAME,
acceptedMinecraftVersions = BetterFoliageMod.MC_VERSIONS, acceptedMinecraftVersions = BetterFoliageMod.MC_VERSIONS,
guiFactory = BetterFoliageMod.GUI_FACTORY guiFactory = BetterFoliageMod.GUI_FACTORY,
clientSideOnly = true
) )
object BetterFoliageMod { object BetterFoliageMod {
@@ -65,11 +66,9 @@ object BetterFoliageMod {
@Mod.EventHandler @Mod.EventHandler
fun postInit(event: FMLPostInitializationEvent) { fun postInit(event: FMLPostInitializationEvent) {
if (FMLCommonHandler.instance().effectiveSide == Side.CLIENT) { Config.attach(config!!)
Config.attach(config!!) Client.log(INFO, "BetterFoliage initialized")
Client.log(INFO, "BetterFoliage initialized") isAfterPostInit = true
isAfterPostInit = true
}
} }
/** Mod is cosmetic only, always allow connection. */ /** Mod is cosmetic only, always allow connection. */