diff --git a/build.gradle b/build.gradle index fb87b0d9d..fe740ad2a 100755 --- a/build.gradle +++ b/build.gradle @@ -88,7 +88,7 @@ configurations { dependencies { api 'net.industrial-craft:industrialcraft-2:2.2.713-experimental:api' - api name: "buildcraft", version: "7.0.25", classifier: "api" + api name: "buildcraft", version: "7.1.12", classifier: "api" // http://files.minecraftforge.net/CodeChickenLib/ compile "codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev" diff --git a/src/main/java/forestry/core/config/Constants.java b/src/main/java/forestry/core/config/Constants.java index 732f1638c..53551775c 100644 --- a/src/main/java/forestry/core/config/Constants.java +++ b/src/main/java/forestry/core/config/Constants.java @@ -154,6 +154,8 @@ public class Constants implements IForestryConstants { public static final int BOTTLER_FILLING_TIME = 20; public static final int BOTTLER_FUELCAN_VOLUME = 2000; + public static final float ICE_COOLING_MULTIPLIER = 6f; // multiple of water's cooling value + // Storage public static final int RAINTANK_TANK_CAPACITY = 30 * BUCKET_VOLUME; public static final int RAINTANK_AMOUNT_PER_UPDATE = 10; diff --git a/src/main/java/forestry/plugins/PluginBuildCraftFuels.java b/src/main/java/forestry/plugins/PluginBuildCraftFuels.java index 5e668d017..902a83b07 100644 --- a/src/main/java/forestry/plugins/PluginBuildCraftFuels.java +++ b/src/main/java/forestry/plugins/PluginBuildCraftFuels.java @@ -20,6 +20,8 @@ import forestry.core.fluids.Fluids; import forestry.core.utils.ModUtil; import buildcraft.api.fuels.BuildcraftFuelRegistry; +import buildcraft.api.fuels.ICoolant; +import buildcraft.api.fuels.ICoolantManager; @Plugin(pluginID = "BC6|Fuels", name = "BuildCraft 6 Fuels", author = "mezz", url = Constants.URL, unlocalizedDescription = "for.plugin.buildcraft6.description") public class PluginBuildCraftFuels extends ForestryPlugin { @@ -37,7 +39,11 @@ public class PluginBuildCraftFuels extends ForestryPlugin { @Optional.Method(modid = "BuildCraftAPI|fuels") @Override public void doInit() { - BuildcraftFuelRegistry.coolant.addCoolant(Fluids.ICE.getFluid(), 10.0f); + ICoolantManager coolantManager = BuildcraftFuelRegistry.coolant; + ICoolant waterCoolant = coolantManager.getCoolant(Fluids.WATER.getFluid()); + float waterCooling = waterCoolant.getDegreesCoolingPerMB(100); + + coolantManager.addCoolant(Fluids.ICE.getFluid(), Constants.ICE_COOLING_MULTIPLIER * waterCooling); Fluid ethanol = Fluids.ETHANOL.getFluid(); if (ethanol != null) { diff --git a/src/main/java/forestry/plugins/PluginEnderIO.java b/src/main/java/forestry/plugins/PluginEnderIO.java index 05c6ac0d2..85ad279c5 100644 --- a/src/main/java/forestry/plugins/PluginEnderIO.java +++ b/src/main/java/forestry/plugins/PluginEnderIO.java @@ -24,6 +24,8 @@ public class PluginEnderIO extends ForestryPlugin { private static final String KEY_TOTAL_BURN_TIME = "totalBurnTime"; private static final String KEY_COOLING_PER_MB = "coolingPerMb"; + private static final float WATER_COOLING_PER_MB = 0.0023f; + @Override public boolean isAvailable() { return ModUtil.isModLoaded(EnderIO); @@ -44,7 +46,7 @@ public class PluginEnderIO extends ForestryPlugin { Fluid crushedIce = Fluids.ICE.getFluid(); if (crushedIce != null) { - addCoolant(crushedIce, 10.0f); + addCoolant(crushedIce, Constants.ICE_COOLING_MULTIPLIER); } } @@ -57,7 +59,8 @@ public class PluginEnderIO extends ForestryPlugin { FMLInterModComms.sendMessage(EnderIO, FLUID_FUEL_ADD, fuelTag); } - private static void addCoolant(Fluid fluid, float coolingPerMb) { + private static void addCoolant(Fluid fluid, float coolingMultiplier) { + float coolingPerMb = coolingMultiplier * WATER_COOLING_PER_MB; NBTTagCompound coolantTag = new NBTTagCompound(); coolantTag.setString(KEY_FLUID_NAME, fluid.getName()); coolantTag.setFloat(KEY_COOLING_PER_MB, coolingPerMb);