Skip to content

Commit f483d38

Browse files
committed
Fix ForgeGradle version issue on LiteLoader and sub-module projects
1 parent 94cfca1 commit f483d38

File tree

6 files changed

+34
-10
lines changed

6 files changed

+34
-10
lines changed

src/main/kotlin/com/demonwav/mcdev/MinecraftConfigurable.kt

+1-5
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,7 @@ class MinecraftConfigurable : Configurable {
6161
}
6262

6363
private fun setUnderlineBox() {
64-
if (showChatColorUnderlinesCheckBox.isSelected) {
65-
chatColorUnderlinesComboBox.setEnabled(true)
66-
} else {
67-
chatColorUnderlinesComboBox.setEnabled(false)
68-
}
64+
chatColorUnderlinesComboBox.isEnabled = showChatColorUnderlinesCheckBox.isSelected
6965
}
7066

7167
override fun isModified(): Boolean {

src/main/kotlin/com/demonwav/mcdev/platform/forge/ForgeTemplate.kt

+8-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import com.intellij.openapi.vfs.VirtualFile
1919
import java.util.Properties
2020

2121
object ForgeTemplate {
22-
private val MC_1_12 = SemanticVersion.parse("1.12")
22+
val MC_1_12 = SemanticVersion.parse("1.12")
2323

2424
fun applyBuildGradleTemplate(project: Project,
2525
file: VirtualFile,
@@ -68,6 +68,13 @@ object ForgeTemplate {
6868
if (configuration is SpongeForgeProjectConfiguration) {
6969
properties.setProperty("SPONGE_FORGE", "true")
7070
}
71+
// Fixes builds for MC1.12+, requires FG 2.3
72+
val mcVersion = SemanticVersion.parse(configuration.mcVersion)
73+
if (mcVersion >= MC_1_12) {
74+
properties.setProperty("FORGEGRADLE_VERSION", "2.3")
75+
} else {
76+
properties.setProperty("FORGEGRADLE_VERSION", "2.2")
77+
}
7178

7279
BaseTemplate.applyTemplate(project, file, MinecraftFileTemplateGroupFactory.FORGE_SUBMODULE_BUILD_GRADLE_TEMPLATE, properties)
7380

src/main/kotlin/com/demonwav/mcdev/platform/liteloader/LiteLoaderTemplate.kt

+22-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
package com.demonwav.mcdev.platform.liteloader
1212

1313
import com.demonwav.mcdev.platform.BaseTemplate
14+
import com.demonwav.mcdev.platform.forge.ForgeTemplate
1415
import com.demonwav.mcdev.util.MinecraftFileTemplateGroupFactory
16+
import com.demonwav.mcdev.util.SemanticVersion
1517
import com.intellij.openapi.project.Project
1618
import com.intellij.openapi.vfs.VirtualFile
1719
import java.util.Properties
@@ -33,7 +35,18 @@ object LiteLoaderTemplate {
3335
properties.setProperty("MCP_MAPPINGS", configuration.mcpVersion)
3436

3537
BaseTemplate.applyTemplate(project, prop, MinecraftFileTemplateGroupFactory.LITELOADER_GRADLE_PROPERTIES_TEMPLATE, properties)
36-
BaseTemplate.applyTemplate(project, file, MinecraftFileTemplateGroupFactory.LITELOADER_BUILD_GRADLE_TEMPLATE, Properties())
38+
39+
val gradleProps = Properties()
40+
41+
// Fixes builds for MC1.12+, requires FG 2.3
42+
val mcVersion = SemanticVersion.parse(configuration.mcVersion)
43+
if (mcVersion >= ForgeTemplate.MC_1_12) {
44+
gradleProps.setProperty("FORGEGRADLE_VERSION", "2.3")
45+
} else {
46+
gradleProps.setProperty("FORGEGRADLE_VERSION", "2.2")
47+
}
48+
49+
BaseTemplate.applyTemplate(project, file, MinecraftFileTemplateGroupFactory.LITELOADER_BUILD_GRADLE_TEMPLATE, gradleProps)
3750
}
3851

3952
fun applySubmoduleBuildGradleTemplate(project: Project,
@@ -45,6 +58,14 @@ object LiteLoaderTemplate {
4558
val properties = Properties()
4659
properties.setProperty("COMMON_PROJECT_NAME", commonProjectName)
4760

61+
// Fixes builds for MC1.12+, requires FG 2.3
62+
val mcVersion = SemanticVersion.parse(configuration.mcVersion)
63+
if (mcVersion >= ForgeTemplate.MC_1_12) {
64+
properties.setProperty("FORGEGRADLE_VERSION", "2.3")
65+
} else {
66+
properties.setProperty("FORGEGRADLE_VERSION", "2.2")
67+
}
68+
4869
BaseTemplate.applyTemplate(project, file, MinecraftFileTemplateGroupFactory.LITELOADER_SUBMODULE_BUILD_GRADLE_TEMPLATE, properties)
4970

5071
val gradleProps = Properties()

src/main/resources/fileTemplates/j2ee/forge_submodule_build.gradle.ft

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
#end
1313
}
1414
dependencies {
15-
classpath "net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT"
15+
classpath "net.minecraftforge.gradle:ForgeGradle:${FORGEGRADLE_VERSION}-SNAPSHOT"
1616
#if (${SPONGE_FORGE})
1717
classpath "gradle.plugin.org.spongepowered:spongegradle:0.8.1"
1818
#end

src/main/resources/fileTemplates/j2ee/liteloader_build.gradle.ft

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ buildscript {
1616
}
1717
}
1818
dependencies {
19-
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
19+
classpath 'net.minecraftforge.gradle:ForgeGradle:${FORGEGRADLE_VERSION}-SNAPSHOT'
2020
classpath 'org.spongepowered:mixingradle:0.4-SNAPSHOT'
2121
}
2222
}

src/main/resources/fileTemplates/j2ee/liteloader_submodule_build.gradle.ft

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ buildscript {
1616
}
1717
}
1818
dependencies {
19-
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
19+
classpath 'net.minecraftforge.gradle:ForgeGradle:${FORGEGRADLE_VERSION}-SNAPSHOT'
2020
classpath 'org.spongepowered:mixingradle:0.4-SNAPSHOT'
2121
}
2222
}

0 commit comments

Comments
 (0)