diff --git a/build.gradle b/build.gradle index ff8b98d..47e038d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ buildscript { repositories { jcenter() - maven { url = "http://files.minecraftforge.net/maven" } + maven { url = "https://maven.minecraftforge.net" } } dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' @@ -15,6 +15,21 @@ def modMajor = "2" def modMinor = "5" def modPatch = "4" +// CoFH / Thermal Foundation — pinned universal jars from https://maven.covers1624.net (see ThermalFoundation-1.12-Legacy) +ext.cofhVersions = [ + rf : "1.12-2.1.0.6", + core : "1.12.2-4.6.1.22", + world : "1.12.2-1.3.0.6", + thermal: "1.12.2-2.6.1.22" +] + +// CurseForge file IDs for https://www.cursemaven.com/ (project slug arbitrary; id must match file) +ext.curseVersions = [ + guideApi : "2645992", // Guide-API-1.12-2.1.8-63 — matches Blood Magic 1.12 branch (gradle.properties) + bloodMagic : "2822288", // BloodMagic-1.12.2-2.4.3-105.jar + matterOverdrive: "6439254" // MatterOverdrive-1.12.2-0.9.0-universal (Community Edition) +] + version = "${mcVersion}-${modMajor}.${modMinor}.${modPatch}" group = "xt9.deepmoblearning" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "deepmoblearning" @@ -48,11 +63,7 @@ repositories { maven { // location of the maven that hosts JEI files name = "Progwml6 maven" - url = "http://dvs1.progwml6.com/files/maven" - } - maven { // GuideAPI for BloodMagic - name = "Tehnut Maven" - url = "http://tehnut.info/maven/" + url = "https://dvs1.progwml6.com/files/maven" } maven { url = "https://maven.blamejared.com" @@ -60,12 +71,24 @@ repositories { maven { // location of a maven mirror for JEI files, as a fallback name = "ModMaven" - url = "modmaven.k-4u.nl" + url = "https://modmaven.dev" + } + maven { + name = "Covers1624 Maven" + url = "https://maven.covers1624.net" + } + maven { + name = "tterrag Maven" + url = "https://maven.tterrag.com" } maven { name = "CurseForge" url = "https://minecraft.curseforge.com/api/maven/" } + maven { + name = "CurseMaven" + url = "https://cursemaven.com/" + } } dependencies { @@ -75,17 +98,20 @@ dependencies { runtime "mezz.jei:jei_${mcVersion}:4.10.0.201" compile "vazkii.patchouli:Patchouli:1.0-18.91" - compile "info.amerifrance.guideapi:Guide-API:1.12-2.1.5-60" - compile "blood-magic:BloodMagic-1.12.2:2.2.12:97" - compile "deep-mob-learning-blood-magic-addon:deepmoblearningbm-1.12.2:0.9.1:universal" + // Blood Magic + Guide-API (CurseMaven) — aligns with WayofTime/BloodMagic 1.12 branch deps; no Java API usage in DML, useful for dev classpath / parity + deobfCompile "curse.maven:guide-api-228832:${curseVersions.guideApi}" + deobfCompile "curse.maven:blood-magic-224791:${curseVersions.bloodMagic}" - compile "matteroverdrive:MatterOverdrive-1.12.2:release:universal" + // Matter Overdrive: Community Edition + CLib (see artillect/MatterOverdrive 1.12.2 build.gradle — CLib on tterrag) + deobfCompile "com.astro.clib:CLib:1.0.2.31:deobf" + deobfCompile "curse.maven:matter-overdrive-community-edition-557428:${curseVersions.matterOverdrive}" - compile "cofhcore:CoFHCore-1.12.2:4.6.1.22:universal" - compile "thermal-foundation:ThermalFoundation-1.12.2:2.6.1.22:universal" - compile "redstone-flux:RedstoneFlux-1.12:2.1.0.6:universal" - compile "cofh-world:CoFHWorld-1.12.2:1.3.0.6:universal" + // Thermal Foundation stack (CoFH Maven) — compile-time elemental integration (EntityBlizz, etc.) + deobfCompile "cofh:RedstoneFlux:${cofhVersions.rf}:universal" + deobfCompile "cofh:CoFHCore:${cofhVersions.core}:universal" + deobfCompile "cofh:CoFHWorld:${cofhVersions.world}:universal" + deobfCompile "cofh:ThermalFoundation:${cofhVersions.thermal}:universal" compile "the-twilight-forest:twilightforest-1.12.2:release:universal" compile "tinkers-construct:TConstruct:1.12.2:2.10.0.81" diff --git a/src/main/java/xt9/deepmoblearning/common/mobmetas/MobMetaFactory.java b/src/main/java/xt9/deepmoblearning/common/mobmetas/MobMetaFactory.java index 001bf0f..a3b6455 100644 --- a/src/main/java/xt9/deepmoblearning/common/mobmetas/MobMetaFactory.java +++ b/src/main/java/xt9/deepmoblearning/common/mobmetas/MobMetaFactory.java @@ -242,8 +242,8 @@ else if(key.equals(MobKey.GUARDIAN)) { ); } } - - if(key.equals(MobKey.MO_ANDROID)) { + + if(DeepConstants.MOD_MO_LOADED && key.equals(MobKey.MO_ANDROID)) { meta = new MOAndroidMeta(MobKey.MO_ANDROID, "Rogue Android", "Rogue Androids", 0, 33, 4, 8, Registry.livingMatterOverworldian, Registry.pristineMatterMOAndroid); } diff --git a/src/main/java/xt9/deepmoblearning/plugins/patchouli/Module.java b/src/main/java/xt9/deepmoblearning/plugins/patchouli/Module.java index ea65375..c6d011a 100644 --- a/src/main/java/xt9/deepmoblearning/plugins/patchouli/Module.java +++ b/src/main/java/xt9/deepmoblearning/plugins/patchouli/Module.java @@ -9,7 +9,6 @@ import vazkii.patchouli.api.PatchouliAPI; import xt9.deepmoblearning.DeepConstants; -import xt9.deepmoblearningbm.ModConstants; import java.io.IOException; import java.io.InputStream; @@ -44,8 +43,8 @@ public static void postInit() { if(r.getValue().getRecipeOutput().getItem().getRegistryName().getResourceDomain().equals(DeepConstants.MODID)) { dmlItemRecipes.add(r.getValue()); } - /* Add for blood magic addon aswell */ - if(r.getValue().getRecipeOutput().getItem().getRegistryName().getResourceDomain().equals(ModConstants.MODID)) { + /* Add for blood magic addon as well, without hard dependency on addon classes */ + if(r.getValue().getRecipeOutput().getItem().getRegistryName().getResourceDomain().equals("deepmoblearningbm")) { dmlItemRecipes.add(r.getValue()); } });