diff --git a/dependencies.gradle b/dependencies.gradle index 1aed663..097f51f 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,11 +1,11 @@ // Add your dependencies here dependencies { - shadeCompile("org.jetbrains.kotlin:kotlin-stdlib") - shadeCompile("org.jetbrains.kotlin:kotlin-stdlib-jdk7") - shadeCompile("org.jetbrains.kotlin:kotlin-stdlib-jdk8") - shadeCompile("org.jetbrains.kotlin:kotlin-reflect") + shadeCompile("org.jetbrains.kotlin:kotlin-stdlib:1.5.30") + shadeCompile("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30") + shadeCompile("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30") + shadeCompile("org.jetbrains.kotlin:kotlin-reflect:1.5.30") shadeCompile("org.jetbrains:annotations") - shadeCompile("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0") - shadeCompile("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.0") + shadeCompile("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2") + shadeCompile("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.5.2") } diff --git a/gradle.properties b/gradle.properties index 49132f1..6685c4f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -33,11 +33,11 @@ developmentEnvironmentUserName = Developer # The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's # version in @Mod([...], version = VERSION, [...]) # Leave these properties empty to skip individual token replacements -replaceGradleTokenInFile = Tags.java -gradleTokenModId = GRADLETOKEN_MODID -gradleTokenModName = GRADLETOKEN_MODNAME +replaceGradleTokenInFile = Forgelin.kt +gradleTokenModId = +gradleTokenModName = gradleTokenVersion = GRADLETOKEN_VERSION -gradleTokenGroupName = GRADLETOKEN_GROUPNAME +gradleTokenGroupName = # In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can # leave this property empty. @@ -59,7 +59,7 @@ mixinsPackage = # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin! # This parameter is for legacy compatibility only # Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin -coreModClass = +coreModClass = forgelin.preloader.ForgelinPlugin # If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class # that is annotated with @Mod) you want this to be true. When in doubt: leave it on false! containsMixinsAndOrCoreModOnly = false diff --git a/src/main/kotlin/net/shadowfacts/forgelin/Forgelin.kt b/src/main/kotlin/net/shadowfacts/forgelin/Forgelin.kt index f384353..c75ccec 100644 --- a/src/main/kotlin/net/shadowfacts/forgelin/Forgelin.kt +++ b/src/main/kotlin/net/shadowfacts/forgelin/Forgelin.kt @@ -8,7 +8,8 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent /** * @author shadowfacts */ -@Mod(modid = Forgelin.MOD_ID, name = Forgelin.NAME, version = "GRADLETOKEN_VERSION", acceptableRemoteVersions = "*", acceptedMinecraftVersions = "*", modLanguageAdapter = "net.shadowfacts.forgelin.KotlinAdapter") +// kotlin doesn't work with the current variable substitute system, so... +@Mod(modid = Forgelin.MOD_ID, name = Forgelin.NAME, version = "1.9.6-GTNH", acceptableRemoteVersions = "*", acceptedMinecraftVersions = "*", modLanguageAdapter = "net.shadowfacts.forgelin.KotlinAdapter") object Forgelin { const val MOD_ID = "forgelin"