diff --git a/gradle.properties b/gradle.properties index 32c95ff7..e827b52b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -33,7 +33,7 @@ fmp_version=1.1.1.324 code_chicken_lib_version=1.1.3.127 code_chicken_core_version=1.0.4.35 nei_version=1.0.4.90 -bc_version=6.4.6 +bc_version=7.0.9 ######################################################### # Self Compiled APIs # diff --git a/gradle/scripts/dependencies.gradle b/gradle/scripts/dependencies.gradle index 6bd95999..78932f9f 100644 --- a/gradle/scripts/dependencies.gradle +++ b/gradle/scripts/dependencies.gradle @@ -45,10 +45,16 @@ repositories { url = "http://maven.tterrag.com/" } - maven { + maven { name = "RX14 Proxy" url = "http://mvn.rx14.co.uk/repo/" } + + ivy { + name "BuildCraft" + artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]" + } + // CurseForge DNS for TE is not available or I am just being unlucky, code part can stay since this is applicable to any other curseforge mod though // ivy { // name = "CoFHLib" diff --git a/src/main/java/appeng/integration/IntegrationType.java b/src/main/java/appeng/integration/IntegrationType.java index e0ac4d12..4b3cf65e 100644 --- a/src/main/java/appeng/integration/IntegrationType.java +++ b/src/main/java/appeng/integration/IntegrationType.java @@ -1,6 +1,6 @@ /* * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. + * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved. * * Applied Energistics 2 is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -27,7 +27,7 @@ public enum IntegrationType RC( IntegrationSide.BOTH, "Railcraft", "Railcraft" ), - BC( IntegrationSide.BOTH, "BuildCraft", "BuildCraft|Silicon" ), + BC( IntegrationSide.BOTH, "BuildCraft", "BuildCraft|Core" ), RF( IntegrationSide.BOTH, "RedstoneFlux Power - Tiles", "CoFHAPI" ), diff --git a/src/main/java/appeng/integration/modules/BC.java b/src/main/java/appeng/integration/modules/BC.java index 995ed968..4927c251 100644 --- a/src/main/java/appeng/integration/modules/BC.java +++ b/src/main/java/appeng/integration/modules/BC.java @@ -31,6 +31,7 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.event.FMLInterModComms; +import buildcraft.BuildCraftCore; import buildcraft.BuildCraftEnergy; import buildcraft.BuildCraftTransport; import buildcraft.api.blueprints.BuilderAPI; @@ -181,9 +182,9 @@ public final class BC extends BaseModule implements IBC public void registerPowerP2P() { IP2PTunnelRegistry reg = AEApi.instance().registries().p2pTunnel(); - reg.addNewAttunement( new ItemStack( BuildCraftEnergy.engineBlock, 1, 0 ), TunnelType.RF_POWER ); - reg.addNewAttunement( new ItemStack( BuildCraftEnergy.engineBlock, 1, 1 ), TunnelType.RF_POWER ); - reg.addNewAttunement( new ItemStack( BuildCraftEnergy.engineBlock, 1, 2 ), TunnelType.RF_POWER ); + reg.addNewAttunement( new ItemStack( BuildCraftCore.engineBlock, 1, 0 ), TunnelType.RF_POWER ); + reg.addNewAttunement( new ItemStack( BuildCraftCore.engineBlock, 1, 1 ), TunnelType.RF_POWER ); + reg.addNewAttunement( new ItemStack( BuildCraftCore.engineBlock, 1, 2 ), TunnelType.RF_POWER ); reg.addNewAttunement( new ItemStack( BuildCraftTransport.pipePowerCobblestone ), TunnelType.RF_POWER ); reg.addNewAttunement( new ItemStack( BuildCraftTransport.pipePowerDiamond ), TunnelType.RF_POWER ); reg.addNewAttunement( new ItemStack( BuildCraftTransport.pipePowerGold ), TunnelType.RF_POWER );