From d343ac47f50c609dbf105471672eaf3e2a334ad1 Mon Sep 17 00:00:00 2001 From: yueh Date: Tue, 25 Dec 2018 21:21:08 +0100 Subject: [PATCH] Added CTM as actual soft dependency. (#3881) --- gradle.properties | 2 +- gradle/scripts/dependencies.gradle | 2 +- src/main/java/appeng/core/AppEng.java | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7dfd08bd3..993731d66 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,7 +26,7 @@ top_version=1.12-1.4.23-16 cofhcore_version=1.12.2-4.5.2.19 crafttweaker_version=4.1.8.9 inventorytweaks_version=1.63 -ctm_version=0.3.0.15 +ctm_version=MC1.12.2-0.3.1.16 ######################################################### # Deployment # diff --git a/gradle/scripts/dependencies.gradle b/gradle/scripts/dependencies.gradle index 3f48ccdd7..67caea2a7 100644 --- a/gradle/scripts/dependencies.gradle +++ b/gradle/scripts/dependencies.gradle @@ -94,7 +94,7 @@ dependencies { compileOnly "cofh:CoFHCore:${cofhcore_version}:deobf" compileOnly "CraftTweaker2:CraftTweaker2-API:${crafttweaker_version}" compileOnly "inventory-tweaks:InventoryTweaks:${inventorytweaks_version}:api" - compileOnly "team.chisel.ctm:CTM:MC1.12-${ctm_version}" + compileOnly "team.chisel.ctm:CTM:${ctm_version}" // at runtime, use the full JEI jar runtime "mezz.jei:jei_${minecraft_version}:${jei_version}" diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index 0aed41f02..40c10a7ea 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/src/main/java/appeng/core/AppEng.java @@ -47,6 +47,8 @@ import net.minecraftforge.fml.common.event.FMLServerStoppedEvent; import net.minecraftforge.fml.common.event.FMLServerStoppingEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; +import team.chisel.ctm.CTM; + import appeng.api.AEApi; import appeng.core.crash.CrashInfo; import appeng.core.crash.IntegrationCrashEnhancement; @@ -81,7 +83,7 @@ public final class AppEng private static final String FORGE_CURRENT_VERSION = ForgeVersion.majorVersion + "." + ForgeVersion.minorVersion + "." + ForgeVersion.revisionVersion + "." + ForgeVersion.buildVersion; private static final String FORGE_MAX_VERSION = ( ForgeVersion.majorVersion + 1 ) + ".0.0.0"; - public static final String MOD_DEPENDENCIES = "required-after:forge@[" + FORGE_CURRENT_VERSION + "," + FORGE_MAX_VERSION + ")"; + public static final String MOD_DEPENDENCIES = "required-after:forge@[" + FORGE_CURRENT_VERSION + "," + FORGE_MAX_VERSION + ");after:ctm@[" + CTM.VERSION + ",);"; @Nonnull private static final AppEng INSTANCE = new AppEng();