From aa9b9fafb0d23d3a04535967b2cce6ae7642074b Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 2 Jul 2016 01:52:38 -0400 Subject: [PATCH] Fixed MCMultipart auto-download --- build.gradle | 4 ++-- src/main/java/mekanism/common/util/CableUtils.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 4ba00c49b..c8ad0d6c0 100644 --- a/build.gradle +++ b/build.gradle @@ -91,7 +91,7 @@ task coreJar(type: Jar) { from('etc/core') { include '*.info' - expand 'version': config.mod_version, 'mc_version': config.minecraft_version, 'mcmp_version': config.FMP_version + expand 'version':config.mod_version,'mc_version':config.minecraft_version,'mcmp_version':config.mcmp_version } from zipTree(jar.outputs.getFiles().getSingleFile()).matching { @@ -117,7 +117,7 @@ task generatorsJar(type: Jar) { from('etc/generators') { include '*.info' - expand 'version':config.mod_version,'mc_version':config.minecraft_version,'fmp_version':config.FMP_version + expand 'version':config.mod_version,'mc_version':config.minecraft_version,'mcmp_version':config.mcmp_version } from zipTree(jar.outputs.getFiles().getSingleFile()).matching { diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index 6856cf533..8048c4b67 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -1,7 +1,6 @@ package mekanism.common.util; import ic2.api.energy.EnergyNet; -import ic2.api.energy.tile.IEnergyEmitter; import ic2.api.energy.tile.IEnergySink; import ic2.api.energy.tile.IEnergySource; import ic2.api.energy.tile.IEnergyTile; @@ -169,7 +168,7 @@ public final class CableUtils if(tile instanceof IEnergySink) { - if(((IEnergySink)tile).acceptsEnergyFrom(orig instanceof IEnergyEmitter ? (IEnergyEmitter)orig : null, side.getOpposite())) + if(((IEnergySink)tile).acceptsEnergyFrom(null, side.getOpposite())) { return true; }