Fix #932 The coolant ability of crushed ice is 1000s of times too high

This commit is contained in:
mezz committed 2015-10-29 17:20:37 -07:00
1 parent 6ed24c7c8c
commit 6a3e3e6f55
4 files changed
+15 -4

No files matched your search

@@ -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;
@@ -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) {
@@ -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);