From 385a5ea8b5cad11c8b8afabcafc0ff9f985d2917 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 16 Nov 2018 16:51:26 +0000 Subject: [PATCH] Include TechReborn Mod Compatibility using jar in jar --- build.gradle | 14 ++++++++++++++ src/main/java/techreborn/lib/ModInfo.java | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e9a709eef..2d11f4be1 100644 --- a/build.gradle +++ b/build.gradle @@ -13,11 +13,16 @@ buildscript { maven { url "https://plugins.gradle.org/m2/" } + maven { + name = "CB Repo" + url = "http://chickenbones.net/maven" + } } dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' classpath "gradle.plugin.net.minecrell:licenser:0.2.1" classpath 'de.undercouch:gradle-download-task:3.4.3' + classpath 'net.covers1624:GradleStuff:1.0-SNAPSHOT' } } @@ -26,6 +31,7 @@ apply plugin: 'maven' apply plugin: 'maven-publish' apply plugin: net.minecrell.gradle.licenser.Licenser apply plugin: 'de.undercouch.download' +apply plugin: 'net.covers1624.contained-deps' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -80,6 +86,9 @@ dependencies { deobfCompile('RebornCore:RebornCore-1.12.2:+:universal') { transitive = false } + shade ('TechReborn:TechReborn-ModCompatibility-1.12.2:+:universal') { + transitive = false + } deobfCompile "mezz.jei:jei_1.12.2:+" deobfCompile 'net.industrial-craft:industrialcraft-2:2.8.+' @@ -120,6 +129,11 @@ task deobfJar(type: Jar) { } +containedDeps { + configuration = "shade" + tasks = "jar" +} + jar { exclude "**/*.psd" classifier = 'universal' diff --git a/src/main/java/techreborn/lib/ModInfo.java b/src/main/java/techreborn/lib/ModInfo.java index 31bc77d72..cb726c84b 100644 --- a/src/main/java/techreborn/lib/ModInfo.java +++ b/src/main/java/techreborn/lib/ModInfo.java @@ -30,7 +30,7 @@ public class ModInfo implements IModInfo { public static final String MOD_NAME = "Tech Reborn"; public static final String MOD_ID = "techreborn"; public static final String MOD_VERSION = "@MODVERSION@"; - public static final String MOD_DEPENDENCIES = "required-after:forge@[14.23.3.2694,);required-after:reborncore;after:jei@[4.12,);after:ic2"; + public static final String MOD_DEPENDENCIES = "required-after:forge@[14.23.3.2694,);required-after:reborncore;after:jei@[4.12,);after:ic2;required-before:techreborn_compat"; public static final String SERVER_PROXY_CLASS = "techreborn.proxies.CommonProxy"; public static final String CLIENT_PROXY_CLASS = "techreborn.proxies.ClientProxy"; public static final String GUI_FACTORY_CLASS = "techreborn.config.TechRebornGUIFactory";